Merge pull request #37 from kube-tarian/tls-change-revert

Changed the argocd serice url format
kube-tarian · Jan 22, 2023 · 7bb5c62 · 7bb5c62
2 parents f82cbf6 + 96e56ff
commit 7bb5c62
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/charts/kad/Chart.yaml b/charts/kad/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/kad/templates/config-worker-deployment.yaml b/charts/kad/templates/config-worker-deployment.yaml
@@ -50,9 +50,12 @@ spec:
             - name: PORT
               value: "{{ .Values.service.port }}"
             - name: ARGOCD_SERVICE_URL
-              value: {{ .Values.argocd.serviceURL }}
+              value: "{{ .Values.argocd.serviceURL }}"
             - name: ARGOCD_PASSWORD
-              value: {{ .Values.argocd.password }}
+              valueFrom:
+                secretKeyRef:
+                  name: "argocd-initial-admin-secret"
+                  key: "password"
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/charts/kad/templates/deployment-worker-deployment.yaml b/charts/kad/templates/deployment-worker-deployment.yaml
@@ -50,7 +50,7 @@ spec:
             - name: PORT
               value: "{{ .Values.service.port }}"
             - name: ARGOCD_SERVICE_URL
-              value: "{{ .Values.argocd.serviceURL }}.{{ .Release.Namespace }}.svc.cluster.local"
+              value: "{{ .Values.argocd.serviceURL }}"
             - name: ARGOCD_PASSWORD
               valueFrom:
                 secretKeyRef:

diff --git a/charts/kad/values.yaml b/charts/kad/values.yaml
@@ -91,8 +91,7 @@ temporal:
   temporalServiceURL: temporal-frontend
 
 argocd:
-  serviceURL: argocd-server
-  password: to-be-replaced
+  serviceURL: argocd-server.default.svc.cluster.local
 
 # TODO: attributes to be added
 cassandra:
diff --git a/charts/server/Chart.yaml b/charts/server/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to