Reorder volumeMounts to preserve old behavior

neuvector · Aug 21, 2024 · 8604949 · 8604949
1 parent 1d3672c
commit 8604949
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/charts/core/templates/registry-adapter.yaml b/charts/core/templates/registry-adapter.yaml
@@ -101,7 +101,20 @@ spec:
 {{- toYaml . | nindent 14 }}
             {{- end }}
           volumeMounts:
-          {{- if .Values.cve.adapter.certificate.secret }}
+          {{- if or .Values.internal.certmanager.enabled .Values.cve.adapter.internal.certificate.secret }}
+            - mountPath: /etc/neuvector/certs/internal/cert.key
+              subPath: {{ .Values.cve.adapter.internal.certificate.keyFile }}
+              name: internal-cert
+              readOnly: true
+            - mountPath: /etc/neuvector/certs/internal/cert.pem
+              subPath: {{ .Values.cve.adapter.internal.certificate.pemFile }}
+              name: internal-cert
+              readOnly: true
+            - mountPath: /etc/neuvector/certs/internal/ca.cert
+              subPath: {{ .Values.cve.adapter.internal.certificate.caFile }}
+              name: internal-cert
+              readOnly: true
+          {{- else if .Values.cve.adapter.certificate.secret }}
             - mountPath: /etc/neuvector/certs/ssl-cert.key
               subPath: {{ .Values.cve.adapter.certificate.keyFile }}
               name: cert
@@ -119,19 +132,6 @@ spec:
               subPath: ssl-cert.pem
               name: cert
               readOnly: true
-          {{- else if or .Values.internal.certmanager.enabled .Values.cve.adapter.internal.certificate.secret }}
-            - mountPath: /etc/neuvector/certs/internal/cert.key
-              subPath: {{ .Values.cve.adapter.internal.certificate.keyFile }}
-              name: internal-cert
-              readOnly: true
-            - mountPath: /etc/neuvector/certs/internal/cert.pem
-              subPath: {{ .Values.cve.adapter.internal.certificate.pemFile }}
-              name: internal-cert
-              readOnly: true
-            - mountPath: /etc/neuvector/certs/internal/ca.cert
-              subPath: {{ .Values.cve.adapter.internal.certificate.caFile }}
-              name: internal-cert
-              readOnly: true
           {{- end }}
           resources:
           {{- if .Values.cve.adapter.resources }}