From 9ecc19180076f0547972fe5f31ee4f8ac0660c8b Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Wed, 23 Oct 2024 15:56:48 +0200 Subject: [PATCH] Revert applying scdf-datasource. --- src/deploy/k8s/yaml/server-config.yaml | 8 +--- src/deploy/k8s/yaml/server-deployment.yaml | 45 +++++++++++++++++++++ src/deploy/k8s/yaml/skipper-config.yaml | 6 +-- src/deploy/k8s/yaml/skipper-deployment.yaml | 45 +++++++++++++++++++++ 4 files changed, 93 insertions(+), 11 deletions(-) diff --git a/src/deploy/k8s/yaml/server-config.yaml b/src/deploy/k8s/yaml/server-config.yaml index db88479c46..b4d4c97248 100644 --- a/src/deploy/k8s/yaml/server-config.yaml +++ b/src/deploy/k8s/yaml/server-config.yaml @@ -17,7 +17,7 @@ data: enabled: false maven: remoteRepositories: - sprinklerRepo: + sprinklerRepo: url: https://maven.pkg.github.com/corneil/sprinkler-demos username: 'corneil' password: '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' @@ -32,7 +32,7 @@ data: imagePullSecret: registry-key containerSecurityContext: runAsUser: - dataflow: + dataflow: metrics.dashboard: url: 'http://localhost:3000' task: @@ -40,10 +40,6 @@ data: kubernetes: accounts: default: - secretRefs: - - scdf-datasource - configMapRefs: - - scdf-datasource environmentVariables: 'JAVA_TOOL_OPTIONS=-XX:ActiveProcessorCount=-1' imagePullPolicy: IfNotPresent imagePullSecret: registry-key diff --git a/src/deploy/k8s/yaml/server-deployment.yaml b/src/deploy/k8s/yaml/server-deployment.yaml index d64b190526..a19b4d916a 100644 --- a/src/deploy/k8s/yaml/server-deployment.yaml +++ b/src/deploy/k8s/yaml/server-deployment.yaml @@ -85,6 +85,51 @@ spec: # Provide the Skipper service location - name: SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI value: 'http://${SKIPPER_SERVICE_HOST}:${SKIPPER_SERVICE_PORT}/api' + - name: SPRING_DATASOURCE_USERNAME + valueFrom: + secretKeyRef: + key: SPRING_DATASOURCE_USERNAME + name: scdf-datasource + - name: SPRING_DATASOURCE_PASSWORD + valueFrom: + secretKeyRef: + key: SPRING_DATASOURCE_PASSWORD + name: scdf-datasource + - name: SPRING_DATASOURCE_URL + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_URL + name: scdf-datasource + - name: SPRING_DATASOURCE_DRIVER_CLASS_NAME + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_DRIVER_CLASS_NAME + name: scdf-datasource + - name: SPRING_DATASOURCE_TEST_ON_BORROW + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_TEST_ON_BORROW + name: scdf-datasource + - name: SPRING_DATASOURCE_VALIDATION_QUERY + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_VALIDATION_QUERY + name: scdf-datasource + - name: 'SPRING_DATASOURCE_HIKARI_DATA_SOURCE_PROPERTIES_USE_UNICODE' + valueFrom: + configMapKeyRef: + key: 'SPRING_DATASOURCE_HIKARI_DATA_SOURCE_PROPERTIES_USE_UNICODE' + name: 'scdf-datasource' + - name: SPRING_DATASOURCE_HIKARI_DATA_SOURCE_PROPERTIES_CHARACTER_ENCODING + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_HIKARI_DATA_SOURCE_PROPERTIES_CHARACTER_ENCODING + name: scdf-datasource + - name: SPRING_JPA_DATABASE_PLATFORM + valueFrom: + configMapKeyRef: + key: SPRING_JPA_DATABASE_PLATFORM + name: scdf-datasource - name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED' value: 'true' - name: 'MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED' diff --git a/src/deploy/k8s/yaml/skipper-config.yaml b/src/deploy/k8s/yaml/skipper-config.yaml index 98b8a8217b..b2ef7d73f7 100644 --- a/src/deploy/k8s/yaml/skipper-config.yaml +++ b/src/deploy/k8s/yaml/skipper-config.yaml @@ -27,11 +27,7 @@ data: kubernetes: accounts: default: - secretRefs: - - default-binder - - scdf-datasource - configMapRefs: - - scdf-datasource + secretRefs: [ default-binder ] imagePullPolicy: IfNotPresent imagePullSecret: - name: registry-key diff --git a/src/deploy/k8s/yaml/skipper-deployment.yaml b/src/deploy/k8s/yaml/skipper-deployment.yaml index 87b31c4278..95be4d114e 100644 --- a/src/deploy/k8s/yaml/skipper-deployment.yaml +++ b/src/deploy/k8s/yaml/skipper-deployment.yaml @@ -72,6 +72,51 @@ spec: value: 'false' - name: SPRING_CLOUD_KUBERNETES_SECRETS_PATHS value: /etc/secrets + - name: SPRING_DATASOURCE_USERNAME + valueFrom: + secretKeyRef: + key: SPRING_DATASOURCE_USERNAME + name: scdf-datasource + - name: SPRING_DATASOURCE_PASSWORD + valueFrom: + secretKeyRef: + key: SPRING_DATASOURCE_PASSWORD + name: scdf-datasource + - name: SPRING_DATASOURCE_URL + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_URL + name: scdf-datasource + - name: SPRING_DATASOURCE_DRIVER_CLASS_NAME + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_DRIVER_CLASS_NAME + name: scdf-datasource + - name: SPRING_DATASOURCE_TEST_ON_BORROW + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_TEST_ON_BORROW + name: scdf-datasource + - name: SPRING_DATASOURCE_VALIDATION_QUERY + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_VALIDATION_QUERY + name: scdf-datasource + - name: SPRING_DATASOURCE_HIKARI_DATA_SOURCE_PROPERTIES_USE_UNICODE + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_HIKARI_DATA_SOURCE_PROPERTIES_USE_UNICODE + name: scdf-datasource + - name: SPRING_DATASOURCE_HIKARI_DATA_SOURCE_PROPERTIES_CHARACTER_ENCODING + valueFrom: + configMapKeyRef: + key: SPRING_DATASOURCE_HIKARI_DATA_SOURCE_PROPERTIES_CHARACTER_ENCODING + name: scdf-datasource + - name: SPRING_JPA_DATABASE_PLATFORM + valueFrom: + configMapKeyRef: + key: SPRING_JPA_DATABASE_PLATFORM + name: scdf-datasource - name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_ENABLED value: 'true' - name: MANAGEMENT_METRICS_EXPORT_PROMETHEUS_RSOCKET_ENABLED