v3.0.757

env0 · May 22, 2024 · ec08f68 · ec08f68
1 parent 40974b5
commit ec08f68
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -34,3 +34,25 @@ securityContext:
   runAsGroup: {{ .Values.runAsGroup | default 1000 }}
 {{- end }}
 {{- end }}
+
+{{- define "env0-agent.shouldUsePVC" -}}
+{{- $secretValue := dict -}}
+{{- if (hasKey .Values "env0ConfigSecretName") -}}
+  {{- $secretValue = (lookup "v1" "Secret" .Release.Namespace .Values.env0ConfigSecretName).data -}}
+{{- end -}}
+
+{{- if (hasKey .Values "env0StateEncryptionKey") -}}
+  false
+{{- else if (not (hasKey .Values "env0ConfigSecretName")) -}}
+{{- /* no env0StateEncryptionKey in Values AND no env0ConfigSecretName provided */ -}}
+  true
+{{- else -}}
+  {{- if (hasKey $secretValue "ENV0_STATE_ENCRYPTION_KEY") -}}
+  {{- /* k8s Secret contains ENV0_STATE_ENCRYPTION_KEY - no need for PVC */ -}}
+    false
+  {{- else -}}
+  {{- /* k8s Secret does NOT contain ENV0_STATE_ENCRYPTION_KEY */ -}}
+    true
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/templates/persistent-volume-claim.yml b/templates/persistent-volume-claim.yml
@@ -1,4 +1,4 @@
-{{ if not (hasKey .Values "env0StateEncryptionKey") }}
+{{- if (eq (include "env0-agent.shouldUsePVC" .) "true") }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

diff --git a/templates/scaled-job.yml b/templates/scaled-job.yml
@@ -1,5 +1,4 @@
 {{- $stateMountPath := ternary "/mnt/public/" .Values.stateMountPath (.Values.strictSecurityContext | default false) -}}
-
 # a cron job that never runs.
 # its job template is used to trigger jobs via k8s api
 apiVersion: {{ if .Capabilities.APIVersions.Has "batch/v1/CronJob" }}batch/v1{{ else }}batch/v1beta1{{ end }}
@@ -36,11 +35,11 @@ spec:
             {{ end }}            
         spec:
           volumes:
-            {{ if not (hasKey .Values "env0StateEncryptionKey") }}
+            {{- if (eq (include "env0-agent.shouldUsePVC" .) "true") }}
             - name: env0-state-volume
               persistentVolumeClaim:
                 claimName: env0-state-volume-claim
-            {{ end }}
+            {{- end }}
             - name: tmp
               emptyDir: { }
             - name: home
@@ -97,10 +96,10 @@ spec:
                 - update-ca-certificates;
                   node --enable-source-maps main.js;
               volumeMounts:
-              {{ if not (hasKey .Values "env0StateEncryptionKey") }}
+              {{- if (eq (include "env0-agent.shouldUsePVC" .) "true") }}
                 - name: env0-state-volume
                   mountPath: {{ $stateMountPath }}
-              {{ end }}
+              {{- end }}
               {{ if .Values.customCertificates }}
                 - name: etc-ssl-certs
                   mountPath: /etc/ssl/certs