Merge pull request #5 from Commvault/initcontainer

added support for init container
Commvault · Mar 15, 2024 · cef0a36 · cef0a36
2 parents 0406e21 + 159dd77
commit cef0a36
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 21 deletions.
diff --git a/charts/accessnode/templates/_cv.tpl b/charts/accessnode/templates/_cv.tpl
@@ -166,9 +166,6 @@ Values in defaults.yaml gets the last priority
 {{- if eq (include "cv.utils.isMinVersion" (list . 11 40)) "true" }}
 {{- $initContainer = true }}
 {{- end }}
-{{- if .Release.IsUpgrade -}}
-{{- $initContainer = false }}
-{{- end }}
 {{- $initContainer = ternary $defaults.initContainer $initContainer (hasKey $defaults "initContainer") }}
 {{- $initContainer = ternary .Values.initContainer $initContainer (hasKey .Values "initContainer") }}
 {{- $initContainer | toString }}
@@ -295,5 +292,6 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/Base64/Temp/k8ssecrets
         - name: cv-storage-secretssvolume
           mountPath: /tmp/secretcontents
+          subPath: k8ssecrets
 {{- end }}            
 {{- end }}
diff --git a/charts/commandcenter/templates/_cv.tpl b/charts/commandcenter/templates/_cv.tpl
@@ -166,9 +166,6 @@ Values in defaults.yaml gets the last priority
 {{- if eq (include "cv.utils.isMinVersion" (list . 11 40)) "true" }}
 {{- $initContainer = true }}
 {{- end }}
-{{- if .Release.IsUpgrade -}}
-{{- $initContainer = false }}
-{{- end }}
 {{- $initContainer = ternary $defaults.initContainer $initContainer (hasKey $defaults "initContainer") }}
 {{- $initContainer = ternary .Values.initContainer $initContainer (hasKey .Values "initContainer") }}
 {{- $initContainer | toString }}
@@ -295,5 +292,6 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/Base64/Temp/k8ssecrets
         - name: cv-storage-secretssvolume
           mountPath: /tmp/secretcontents
+          subPath: k8ssecrets
 {{- end }}            
 {{- end }}
diff --git a/charts/config/templates/_cv.tpl b/charts/config/templates/_cv.tpl
@@ -166,9 +166,6 @@ Values in defaults.yaml gets the last priority
 {{- if eq (include "cv.utils.isMinVersion" (list . 11 40)) "true" }}
 {{- $initContainer = true }}
 {{- end }}
-{{- if .Release.IsUpgrade -}}
-{{- $initContainer = false }}
-{{- end }}
 {{- $initContainer = ternary $defaults.initContainer $initContainer (hasKey $defaults "initContainer") }}
 {{- $initContainer = ternary .Values.initContainer $initContainer (hasKey .Values "initContainer") }}
 {{- $initContainer | toString }}
@@ -295,5 +292,6 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/Base64/Temp/k8ssecrets
         - name: cv-storage-secretssvolume
           mountPath: /tmp/secretcontents
+          subPath: k8ssecrets
 {{- end }}            
 {{- end }}
diff --git a/charts/cs/templates/_cv.tpl b/charts/cs/templates/_cv.tpl
@@ -166,9 +166,6 @@ Values in defaults.yaml gets the last priority
 {{- if eq (include "cv.utils.isMinVersion" (list . 11 40)) "true" }}
 {{- $initContainer = true }}
 {{- end }}
-{{- if .Release.IsUpgrade -}}
-{{- $initContainer = false }}
-{{- end }}
 {{- $initContainer = ternary $defaults.initContainer $initContainer (hasKey $defaults "initContainer") }}
 {{- $initContainer = ternary .Values.initContainer $initContainer (hasKey .Values "initContainer") }}
 {{- $initContainer | toString }}
@@ -295,5 +292,6 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/Base64/Temp/k8ssecrets
         - name: cv-storage-secretssvolume
           mountPath: /tmp/secretcontents
+          subPath: k8ssecrets
 {{- end }}            
 {{- end }}
diff --git a/charts/mediaagent/templates/_cv.tpl b/charts/mediaagent/templates/_cv.tpl
@@ -166,9 +166,6 @@ Values in defaults.yaml gets the last priority
 {{- if eq (include "cv.utils.isMinVersion" (list . 11 40)) "true" }}
 {{- $initContainer = true }}
 {{- end }}
-{{- if .Release.IsUpgrade -}}
-{{- $initContainer = false }}
-{{- end }}
 {{- $initContainer = ternary $defaults.initContainer $initContainer (hasKey $defaults "initContainer") }}
 {{- $initContainer = ternary .Values.initContainer $initContainer (hasKey .Values "initContainer") }}
 {{- $initContainer | toString }}
@@ -295,5 +292,6 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/Base64/Temp/k8ssecrets
         - name: cv-storage-secretssvolume
           mountPath: /tmp/secretcontents
+          subPath: k8ssecrets
 {{- end }}            
 {{- end }}
diff --git a/charts/networkgateway/templates/_cv.tpl b/charts/networkgateway/templates/_cv.tpl
@@ -166,9 +166,6 @@ Values in defaults.yaml gets the last priority
 {{- if eq (include "cv.utils.isMinVersion" (list . 11 40)) "true" }}
 {{- $initContainer = true }}
 {{- end }}
-{{- if .Release.IsUpgrade -}}
-{{- $initContainer = false }}
-{{- end }}
 {{- $initContainer = ternary $defaults.initContainer $initContainer (hasKey $defaults "initContainer") }}
 {{- $initContainer = ternary .Values.initContainer $initContainer (hasKey .Values "initContainer") }}
 {{- $initContainer | toString }}
@@ -295,5 +292,6 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/Base64/Temp/k8ssecrets
         - name: cv-storage-secretssvolume
           mountPath: /tmp/secretcontents
+          subPath: k8ssecrets
 {{- end }}            
 {{- end }}
diff --git a/charts/webserver/templates/_cv.tpl b/charts/webserver/templates/_cv.tpl
@@ -166,9 +166,6 @@ Values in defaults.yaml gets the last priority
 {{- if eq (include "cv.utils.isMinVersion" (list . 11 40)) "true" }}
 {{- $initContainer = true }}
 {{- end }}
-{{- if .Release.IsUpgrade -}}
-{{- $initContainer = false }}
-{{- end }}
 {{- $initContainer = ternary $defaults.initContainer $initContainer (hasKey $defaults "initContainer") }}
 {{- $initContainer = ternary .Values.initContainer $initContainer (hasKey .Values "initContainer") }}
 {{- $initContainer | toString }}
@@ -295,5 +292,6 @@ cv.commondeploymentpecs creates pod specifications that are common to all deploy
           mountPath: /opt/{{include "cv.utils.getOemPath" .}}/Base64/Temp/k8ssecrets
         - name: cv-storage-secretssvolume
           mountPath: /tmp/secretcontents
+          subPath: k8ssecrets
 {{- end }}            
 {{- end }}