[ws-manager] Ensure values are not overwritten

If a variable is already sourced from a reference do not overwrite it.
gitpod-io · Oct 24, 2022 · 9fd3e3b · 9fd3e3b
1 parent da10c12
commit 9fd3e3b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/components/ws-manager/pkg/manager/create.go b/components/ws-manager/pkg/manager/create.go
@@ -643,6 +643,11 @@ func setProtectedSecrets(pod *corev1.Pod, req *api.StartWorkspaceRequest) {
 				continue
 			}
 
+			// already sourced from somewhere else
+			if env.ValueFrom != nil {
+				continue
+			}
+
 			env.Value = ""
 			env.ValueFrom = &corev1.EnvVarSource{
 				SecretKeyRef: &corev1.SecretKeySelector{

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden b/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden
@@ -171,8 +171,8 @@
                             "name": "one_from_a_secret",
                             "valueFrom": {
                                 "secretKeyRef": {
-                                    "name": "ws-test",
-                                    "key": "31ba5230e08a8d69893703c936aaf570c76246cac7a2f7d4cfd28b8ab180631b"
+                                    "name": "some-secret",
+                                    "key": "some-key"
                                 }
                             }
                         },

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_sys_envvars.golden b/components/ws-manager/pkg/manager/testdata/cdwp_sys_envvars.golden
@@ -175,8 +175,8 @@
                             "name": "one_from_a_secret",
                             "valueFrom": {
                                 "secretKeyRef": {
-                                    "name": "ws-test",
-                                    "key": "31ba5230e08a8d69893703c936aaf570c76246cac7a2f7d4cfd28b8ab180631b"
+                                    "name": "some-secret",
+                                    "key": "some-key"
                                 }
                             }
                         },