diff --git a/config/platform-infra/temporal.yaml b/config/platform-infra/temporal.yaml index 24499cf7..ad8a92ce 100644 --- a/config/platform-infra/temporal.yaml +++ b/config/platform-infra/temporal.yaml @@ -44,11 +44,14 @@ runtime: serviceName: temporal-frontend replicas: 1 frontendPort: 7233 + dynamicConfigFilePath: /etc/temporal/config/dynamicconfig/docker.yaml + enableServiceLinks: false ui: deploymentName: temporal-ui serviceName: temporal-ui replicas: 1 port: 8080 + enableServiceLinks: false auth: username: admin proxyPort: 8081 diff --git a/scripts/src/platform-infra-temporal.ts b/scripts/src/platform-infra-temporal.ts index da78a0e2..8b629ff8 100644 --- a/scripts/src/platform-infra-temporal.ts +++ b/scripts/src/platform-infra-temporal.ts @@ -46,12 +46,20 @@ interface TemporalConfig { secretName: string; }; runtime: { - server: { deploymentName: string; serviceName: string; replicas: number; frontendPort: number }; + server: { + deploymentName: string; + serviceName: string; + replicas: number; + frontendPort: number; + dynamicConfigFilePath: string; + enableServiceLinks: boolean; + }; ui: { deploymentName: string; serviceName: string; replicas: number; port: number; + enableServiceLinks: boolean; auth: { username: string; proxyPort: number; secretName: string; passwordKey: string }; }; logicalNamespaces: Array<{ name: string; retention: string }>; @@ -253,6 +261,7 @@ spec: app.kubernetes.io/name: temporal app.kubernetes.io/part-of: temporal spec: + enableServiceLinks: ${server.enableServiceLinks} containers: - name: temporal image: ${temporal.images.server} @@ -294,7 +303,7 @@ spec: - name: SKIP_DB_CREATE value: "${temporal.database.skipCreate}" - name: DYNAMIC_CONFIG_FILE_PATH - value: config/dynamicconfig/development-sql.yaml + value: ${server.dynamicConfigFilePath} readinessProbe: tcpSocket: port: grpc @@ -338,6 +347,7 @@ spec: app.kubernetes.io/name: temporal-ui app.kubernetes.io/part-of: temporal spec: + enableServiceLinks: ${ui.enableServiceLinks} containers: - name: temporal-ui image: ${temporal.images.ui} @@ -542,9 +552,14 @@ function readTemporalConfig(): TemporalConfig { secretName: stringField(database, "secretName", `${configLabel}.database`), }, runtime: { - server: deploymentConfig(server, `${configLabel}.runtime.server`, "frontendPort"), + server: { + ...deploymentConfig(server, `${configLabel}.runtime.server`, "frontendPort"), + dynamicConfigFilePath: stringField(server, "dynamicConfigFilePath", `${configLabel}.runtime.server`), + enableServiceLinks: booleanField(server, "enableServiceLinks", `${configLabel}.runtime.server`), + }, ui: { ...deploymentConfig(ui, `${configLabel}.runtime.ui`, "port"), + enableServiceLinks: booleanField(ui, "enableServiceLinks", `${configLabel}.runtime.ui`), auth: { username: stringField(uiAuth, "username", `${configLabel}.runtime.ui.auth`), proxyPort: integerField(uiAuth, "proxyPort", `${configLabel}.runtime.ui.auth`),