From ea89d2d029e25a120776f5a3ffe5ac6e96f8b908 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Mon, 30 Oct 2023 08:31:10 +0100 Subject: [PATCH] Prepare configserver chart for update --- .../configserver/test/overwrite_values.yaml | 17 +++++++++++++++-- argocd/configserver/test/values.yaml | 19 +++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/argocd/configserver/test/overwrite_values.yaml b/argocd/configserver/test/overwrite_values.yaml index 5de6d0f..2d488b4 100644 --- a/argocd/configserver/test/overwrite_values.yaml +++ b/argocd/configserver/test/overwrite_values.yaml @@ -1,6 +1,19 @@ image: - tag: 0.1.18 + tag: 0.1.17 application: kafka: host: kafka.kafka - port: 9092 \ No newline at end of file + port: 9092 +environment: + - name: PORT + value: "{{ .Values.application.port }}" + - name: ACTUATOR_PORT + value: "{{ .Values.application.actuatorPort }}" + - name: PREFIX + value: "{{ .Values.application.prefix }}" + - name: REPOSITORY_PATH + value: "{{ .Values.application.repositoryPath }}" + - name: SEARCH_PATH + value: "{{ .Values.application.searchPath }}" + - name: SPRING_KAFKA_BOOTSTRAP-SERVERS + value: "{{ .Values.application.kafka.host }}:{{ .Values.application.kafka.port }}" \ No newline at end of file diff --git a/argocd/configserver/test/values.yaml b/argocd/configserver/test/values.yaml index 0448477..3c2c019 100644 --- a/argocd/configserver/test/values.yaml +++ b/argocd/configserver/test/values.yaml @@ -6,7 +6,7 @@ image: repository: 2martens/configserver pullPolicy: IfNotPresent # Overrides the image tag whose default is latest - tag: "0.1.18" + tag: "0.1.17" # If image is not accessible for Kubernetes without authentication, configure required secrets here # will be added verbatim to imagePullSecrets in deployment pod template imagePullSecrets: [] @@ -64,10 +64,8 @@ environment: value: "{{ .Values.application.repositoryPath }}" - name: SEARCH_PATH value: "{{ .Values.application.searchPath }}" - - name: KAFKA_HOST - value: "{{ .Values.application.kafka.host }}" - - name: KAFKA_PORT - value: "{{ .Values.application.kafka.port }}" + - name: SPRING_KAFKA_BOOTSTRAP-SERVERS + value: "{{ .Values.application.kafka.host }}:{{ .Values.application.kafka.port }}" enableServiceLinks: false # Contents of this object will be added to a Kubernetes secret data section and Base64 encoded # External secrets are not supported by this template @@ -139,14 +137,3 @@ affinity: {} podSpec: {} # containerSpec: will be added at the bottom of the container specification in the pod template containerSpec: {} -argocd: - enabled: false - project: default - repoURL: https://github.com/exampleUser/exampleRepo - targetRevision: HEAD - # pathInRepo: is required if it is a git repo - pathInRepo: / - # chartName: required if repo is a Helm chart repo - chartName: "" - # targetCluster: specifies the cluster to deploy to - targetCluster: https://kubernetes.default.svc