Merge pull request #10 from Commvault/initcontainer

Mounting k8s secrets
Commvault · Jun 14, 2024 · 7ca8212 · 7ca8212
2 parents b2a86ed + 6827db5
commit 7ca8212
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 42 deletions.
diff --git a/charts/accessnode/Chart.yaml b/charts/accessnode/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: accessnode
 description: A Helm chart for creating an access node
 type: application
-version: "1.0.2"
+version: "1.0.3"
 appVersion: "1"
diff --git a/charts/accessnode/templates/_cv.tpl b/charts/accessnode/templates/_cv.tpl
@@ -288,7 +288,7 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
         args:
           - cp /tmp/secretcontents/* /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
         volumeMounts:
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         - name: cv-storage-secretssvolume

diff --git a/charts/accessnode/templates/_pvc.tpl b/charts/accessnode/templates/_pvc.tpl
@@ -173,7 +173,7 @@ storageClass:
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/appdata
           subPath: certificates
         {{- if eq (include "cv.useInitContainer" .) "true" }}
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         {{- end }}
@@ -192,9 +192,7 @@ storageClass:
       {{- if eq (include "cv.useInitContainer" .) "true" }}
       - name: cv-storage-secretssvolume
         secret:
-          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }}
-      - name: configsecrets
-        emptyDir: {}
+          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }} 
       {{- end }}
 {{- end }}
 

diff --git a/charts/commandcenter/Chart.yaml b/charts/commandcenter/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: commandcenter
 description: A Helm chart for creating the command center
 type: application
-version: "1.0.2"
+version: "1.0.3"
 appVersion: "1"
diff --git a/charts/commandcenter/templates/_cv.tpl b/charts/commandcenter/templates/_cv.tpl
@@ -288,7 +288,7 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
         args:
           - cp /tmp/secretcontents/* /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
         volumeMounts:
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         - name: cv-storage-secretssvolume

diff --git a/charts/commandcenter/templates/_pvc.tpl b/charts/commandcenter/templates/_pvc.tpl
@@ -173,7 +173,7 @@ storageClass:
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/appdata
           subPath: certificates
         {{- if eq (include "cv.useInitContainer" .) "true" }}
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         {{- end }}
@@ -192,9 +192,7 @@ storageClass:
       {{- if eq (include "cv.useInitContainer" .) "true" }}
       - name: cv-storage-secretssvolume
         secret:
-          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }}
-      - name: configsecrets
-        emptyDir: {}
+          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }} 
       {{- end }}
 {{- end }}
 

diff --git a/charts/config/Chart.yaml b/charts/config/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: config
 description: A Helm chart for creating the base configuration and secret  for all cv components in the namespace
 type: application
-version: "1.0.2"
+version: "1.0.3"
 appVersion: "1"
diff --git a/charts/config/templates/_cv.tpl b/charts/config/templates/_cv.tpl
@@ -288,7 +288,7 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
         args:
           - cp /tmp/secretcontents/* /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
         volumeMounts:
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         - name: cv-storage-secretssvolume

diff --git a/charts/config/templates/_pvc.tpl b/charts/config/templates/_pvc.tpl
@@ -173,7 +173,7 @@ storageClass:
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/appdata
           subPath: certificates
         {{- if eq (include "cv.useInitContainer" .) "true" }}
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         {{- end }}
@@ -192,9 +192,7 @@ storageClass:
       {{- if eq (include "cv.useInitContainer" .) "true" }}
       - name: cv-storage-secretssvolume
         secret:
-          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }}
-      - name: configsecrets
-        emptyDir: {}
+          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }} 
       {{- end }}
 {{- end }}
 

diff --git a/charts/cs/Chart.yaml b/charts/cs/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: commserve
 description: A Helm chart for creating the CS component
 type: application
-version: "1.0.2"
+version: "1.0.3"
 appVersion: "1"
diff --git a/charts/cs/templates/_cv.tpl b/charts/cs/templates/_cv.tpl
@@ -288,7 +288,7 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
         args:
           - cp /tmp/secretcontents/* /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
         volumeMounts:
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         - name: cv-storage-secretssvolume

diff --git a/charts/cs/templates/_pvc.tpl b/charts/cs/templates/_pvc.tpl
@@ -173,7 +173,7 @@ storageClass:
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/appdata
           subPath: certificates
         {{- if eq (include "cv.useInitContainer" .) "true" }}
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         {{- end }}
@@ -192,9 +192,7 @@ storageClass:
       {{- if eq (include "cv.useInitContainer" .) "true" }}
       - name: cv-storage-secretssvolume
         secret:
-          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }}
-      - name: configsecrets
-        emptyDir: {}
+          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }} 
       {{- end }}
 {{- end }}
 

diff --git a/charts/mediaagent/Chart.yaml b/charts/mediaagent/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: mediaagent
 description: A Helm chart for creating a media agent
 type: application
-version: "1.0.2"
+version: "1.0.3"
 appVersion: "1"
diff --git a/charts/mediaagent/templates/_cv.tpl b/charts/mediaagent/templates/_cv.tpl
@@ -288,7 +288,7 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
         args:
           - cp /tmp/secretcontents/* /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
         volumeMounts:
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         - name: cv-storage-secretssvolume

diff --git a/charts/mediaagent/templates/_pvc.tpl b/charts/mediaagent/templates/_pvc.tpl
@@ -173,7 +173,7 @@ storageClass:
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/appdata
           subPath: certificates
         {{- if eq (include "cv.useInitContainer" .) "true" }}
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         {{- end }}
@@ -192,9 +192,7 @@ storageClass:
       {{- if eq (include "cv.useInitContainer" .) "true" }}
       - name: cv-storage-secretssvolume
         secret:
-          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }}
-      - name: configsecrets
-        emptyDir: {}
+          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }} 
       {{- end }}
 {{- end }}
 

diff --git a/charts/networkgateway/Chart.yaml b/charts/networkgateway/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: networkgateway
 description: A Helm chart for creating an FS agent which can serve as a network gateway
 type: application
-version: "1.0.2"
+version: "1.0.3"
 appVersion: "1"
diff --git a/charts/networkgateway/templates/_cv.tpl b/charts/networkgateway/templates/_cv.tpl
@@ -288,7 +288,7 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
         args:
           - cp /tmp/secretcontents/* /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
         volumeMounts:
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         - name: cv-storage-secretssvolume

diff --git a/charts/networkgateway/templates/_pvc.tpl b/charts/networkgateway/templates/_pvc.tpl
@@ -173,7 +173,7 @@ storageClass:
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/appdata
           subPath: certificates
         {{- if eq (include "cv.useInitContainer" .) "true" }}
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         {{- end }}
@@ -192,9 +192,7 @@ storageClass:
       {{- if eq (include "cv.useInitContainer" .) "true" }}
       - name: cv-storage-secretssvolume
         secret:
-          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }}
-      - name: configsecrets
-        emptyDir: {}
+          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }} 
       {{- end }}
 {{- end }}
 

diff --git a/charts/webserver/Chart.yaml b/charts/webserver/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: webserver
 description: A Helm chart for creating the webserver
 type: application
-version: "1.0.2"
+version: "1.0.3"
 appVersion: "1"
diff --git a/charts/webserver/templates/_cv.tpl b/charts/webserver/templates/_cv.tpl
@@ -288,7 +288,7 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
         args:
           - cp /tmp/secretcontents/* /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
         volumeMounts:
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         - name: cv-storage-secretssvolume

diff --git a/charts/webserver/templates/_pvc.tpl b/charts/webserver/templates/_pvc.tpl
@@ -173,7 +173,7 @@ storageClass:
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/appdata
           subPath: certificates
         {{- if eq (include "cv.useInitContainer" .) "true" }}
-        - name: configsecrets
+        - name: cv-storage-certsandlogs
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/k8ssecrets
           subPath: k8ssecrets
         {{- end }}
@@ -192,9 +192,7 @@ storageClass:
       {{- if eq (include "cv.useInitContainer" .) "true" }}
       - name: cv-storage-secretssvolume
         secret:
-          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }}
-      - name: configsecrets
-        emptyDir: {}
+          secretName: {{ include "cv.metadataname2" (list . "cvcreds") }} 
       {{- end }}
 {{- end }}