Merge pull request #1168 from k8up-io/fix/chart-global-resources-1069

Fix globalResources env var names in Helm chart

Author: tobru

charts/k8up/templates/deployment.yaml

@@ -50,19 +50,19 @@ spec:
                   fieldPath: metadata.namespace
           {{- end }}
           {{- with .Values.k8up.globalResources.requests.cpu }}
-            - name: BACKUP_GLOBALCPU_REQUEST
+            - name: BACKUP_GLOBAL_CPU_REQUEST
               value: {{ . }}
           {{- end }}
           {{- with .Values.k8up.globalResources.requests.memory }}
-            - name: BACKUP_GLOBALMEMORY_REQUEST
+            - name: BACKUP_GLOBAL_MEMORY_REQUEST
               value: {{ . }}
           {{- end }}
           {{- with .Values.k8up.globalResources.limits.cpu }}
-            - name: BACKUP_GLOBALCPU_LIMIT
+            - name: BACKUP_GLOBAL_CPU_LIMIT
               value: {{ . }}
           {{- end }}
           {{- with .Values.k8up.globalResources.limits.memory }}
-            - name: BACKUP_GLOBALMEMORY_LIMIT
+            - name: BACKUP_GLOBAL_MEMORY_LIMIT
               value: {{ . }}
           {{- end }}
           {{- if .Values.k8up.envVars }}

charts/k8up/test/deployment_test.go

@@ -40,7 +40,7 @@ func Test_Deployment_ShouldRender_EnvironmentVariables(t *testing.T) {
 	assert.Equal(t, "BACKUP_SKIP_WITHOUT_ANNOTATION", envs[3].Name)
 	assert.Equal(t, "BACKUP_OPERATOR_NAMESPACE", envs[4].Name)
 	assert.Equal(t, "metadata.namespace", envs[4].ValueFrom.FieldRef.FieldPath)
-	assert.Equal(t, "BACKUP_GLOBALCPU_REQUEST", envs[5].Name, "Deployment does not use configured Env Name")
+	assert.Equal(t, "BACKUP_GLOBAL_CPU_REQUEST", envs[5].Name, "Deployment does not use configured Env Name")
 	assert.Equal(t, wantCpuRequest, envs[5].Value, "Deployment does not use configured Env Value")
 	assert.Equal(t, "VARIABLE", envs[6].Name, "Deployment does not use configured Env Name")
 	assert.Equal(t, "VALUE", envs[6].Value, "Deployment does not use configured Env Value")