Fix extraEnv field placed inside unrelated if clause (#190)

Author: t4lz

mirrord-operator/templates/deployment.yaml

@@ -114,14 +114,14 @@ spec:
         {{- end }}
         - name: OPERATOR_LICENSE_ALLOW_SEAT_OVERAGES
           value: {{ .Values.license.allowSeatOverages | ternary "true" "false" | quote }}
-        {{- if or .Values.license.file.data .Values.license.pemRef }}
-        - name: OPERATOR_LICENSE_PATH
-          value: /license/license.pem
-        {{- else if .Values.license.key }}
         {{- range $key, $val := .Values.operator.extraEnv }}
         - name: {{ $key }}
           value: {{ $val | quote }}
         {{- end }}
+        {{- if or .Values.license.file.data .Values.license.pemRef }}
+        - name: OPERATOR_LICENSE_PATH
+          value: /license/license.pem
+        {{- else if .Values.license.key }}
         envFrom:
         - secretRef:
             name: {{ .Values.license.file.secret }}

test_values/extra_env.yaml

@@ -0,0 +1,10 @@
+license:
+  file:
+    secret: mirrord-operator-license
+    data:
+      license.pem: "DOESN'TNEEDTOBOOTSOITCANBEINVALID"
+
+operator:
+  extraEnv:
+    OPERATOR_COPY_TARGET_RUN_AS_USER_VALUE: 0
+    OPERATOR_COPY_TARGET_RUN_AS_USER_FIELD: "value"