Merge pull request #92 from AKASHNIHAS/main

Updated climon,config-worker,deployment-worker deployment & values.yaml
kube-tarian · May 20, 2023 · 73f03d9 · 73f03d9
2 parents bb9dcd4 + 5eba9b7
commit 73f03d9
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 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.16
+version: 0.1.17
 
 # 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/climon-deployment.yaml b/charts/kad/templates/climon-deployment.yaml
@@ -60,13 +60,16 @@ spec:
             - name: CASSANDRA_TABLE_NAME
               value: "{{ .Values.cassandra.name }}"
             - name: CASSANDRA_USERNAME
-              value: "{{ .Values.cassandra.username }}"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.cassandra.secretName }}"
+                  key: "username"
             - name: CASSANDRA_PASSWORD
-              value: "{{ .Values.cassandra.password }}"
-              # valueFrom:
-              #   secretKeyRef:
-              #     name: "{{ .Values.cassandra.secretName }}"
-              #     key: "password"
+              #value: "{{ .Values.cassandra.password }}"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.cassandra.secretName }}"
+                  key: "password"
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/kad/templates/config-worker-deployment.yaml b/charts/kad/templates/config-worker-deployment.yaml
@@ -60,13 +60,16 @@ spec:
             - name: CASSANDRA_TABLE_NAME
               value: "{{ .Values.cassandra.name }}"
             - name: CASSANDRA_USERNAME
-              value: "{{ .Values.cassandra.username }}"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.cassandra.secretName }}"
+                  key: "username"
             - name: CASSANDRA_PASSWORD
-              value: "{{ .Values.cassandra.password }}"
-              # valueFrom:
-              #   secretKeyRef:
-              #     name: "{{ .Values.cassandra.secretName }}"
-              #     key: "password"
+              #value: "{{ .Values.cassandra.password }}"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.cassandra.secretName }}"
+                  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
@@ -60,13 +60,16 @@ spec:
             - name: CASSANDRA_TABLE_NAME
               value: "{{ .Values.cassandra.name }}"
             - name: CASSANDRA_USERNAME
-              value: "{{ .Values.cassandra.username }}"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.cassandra.secretName }}"
+                  key: "username"
             - name: CASSANDRA_PASSWORD
-              value: "{{ .Values.cassandra.password }}"
-              # valueFrom:
-              #   secretKeyRef:
-              #     name: "{{ .Values.cassandra.secretName }}"
-              #     key: "password"
+              #value: "{{ .Values.cassandra.password }}"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.cassandra.secretName }}"
+                  key: "password"
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/kad/values.yaml b/charts/kad/values.yaml
@@ -97,8 +97,7 @@ argocd:
 
 # Attributes to be added
 cassandra:
-  username: user
-  secretName: "temporal-default-store"
-  serviceURL: "temporal-cassandra"
+  secretName: "temporal-superuser"
+  serviceURL: "temporal-temporal-service"
   keyspaceName: "capten"
   tableName: "tools"