fix: resolve issue where skaffold always added namespace to rendered …

…manifests (#8312)
GoogleContainerTools · Jan 11, 2023 · 8d655cd · 8d655cd
1 parent 8b82382
commit 8d655cd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/integration/render_test.go b/integration/render_test.go
@@ -492,11 +492,11 @@ spec:
   - image: gcr.io/my/project-b
     name: b
 `},
+			// No `metadata.namespace` in offline mode
 			expectedOut: `apiVersion: v1
 kind: Pod
 metadata:
   name: my-pod-123
-  namespace: default
 spec:
   containers:
   - image: 12345.dkr.ecr.eu-central-1.amazonaws.com/my/project-a:4da6a56988057d23f68a4e988f4905dd930ea438-dirty@sha256:d8a33c260c50385ea54077bc7032dba0a860dc8870464f6795fd0aa548d117bf
@@ -535,11 +535,11 @@ spec:
   - image: gcr.io/my/project-b
     name: b
 `},
+			// No `metadata.namespace` in offline mode
 			expectedOut: `apiVersion: v1
 kind: Pod
 metadata:
   name: my-pod-123
-  namespace: default
 spec:
   containers:
   - image: 12345.dkr.ecr.eu-central-1.amazonaws.com/my/project-a:4da6a56988057d23f68a4e988f4905dd930ea438-dirty@sha256:d8a33c260c50385ea54077bc7032dba0a860dc8870464f6795fd0aa548d117bf
@@ -583,13 +583,13 @@ commonLabels:
 resources:
   - deployment.yaml
 `},
+			// No `metadata.namespace` in offline mode
 			expectedOut: `apiVersion: v1
 kind: Pod
 metadata:
   labels:
     this-is-from: kustomization.yaml
   name: my-pod-123
-  namespace: default
 spec:
   containers:
   - image: 12345.dkr.ecr.eu-central-1.amazonaws.com/my/project-a:4da6a56988057d23f68a4e988f4905dd930ea438-dirty@sha256:d8a33c260c50385ea54077bc7032dba0a860dc8870464f6795fd0aa548d117bf
@@ -633,13 +633,13 @@ commonLabels:
 resources:
   - deployment.yaml
 `},
+			// No `metadata.namespace` in offline mode
 			expectedOut: `apiVersion: v1
 kind: Pod
 metadata:
   labels:
     this-is-from: kustomization.yaml
   name: my-pod-123
-  namespace: default
 spec:
   containers:
   - image: 12345.dkr.ecr.eu-central-1.amazonaws.com/my/project-a:4da6a56988057d23f68a4e988f4905dd930ea438-dirty@sha256:d8a33c260c50385ea54077bc7032dba0a860dc8870464f6795fd0aa548d117bf

diff --git a/pkg/skaffold/deploy/kubectl/constants.go b/pkg/skaffold/deploy/kubectl/constants.go
@@ -26,7 +26,6 @@ const DeploymentWebYAML = `apiVersion: v1
 kind: Pod
 metadata:
   name: leeroy-web
-  namespace: default
 spec:
   containers:
   - name: leeroy-web
@@ -36,7 +35,6 @@ const DeploymentWebYAMLv1 = `apiVersion: v1
 kind: Pod
 metadata:
   name: leeroy-web
-  namespace: default
 spec:
   containers:
   - image: leeroy-web:v1
@@ -46,7 +44,6 @@ const DeploymentAppYAML = `apiVersion: v1
 kind: Pod
 metadata:
   name: leeroy-app
-  namespace: default
 spec:
   containers:
   - name: leeroy-app
@@ -56,7 +53,6 @@ const DeploymentAppYAMLv1 = `apiVersion: v1
 kind: Pod
 metadata:
   name: leeroy-app
-  namespace: default
 spec:
   containers:
   - image: leeroy-app:v1
@@ -66,7 +62,6 @@ const DeploymentAppYAMLv2 = `apiVersion: v1
 kind: Pod
 metadata:
   name: leeroy-app
-  namespace: default
 spec:
   containers:
   - image: leeroy-app:v2

diff --git a/pkg/skaffold/render/renderer/util/util.go b/pkg/skaffold/render/renderer/util/util.go
@@ -63,12 +63,14 @@ func GenerateHydratedManifests(ctx context.Context, out io.Writer, builds []grap
 	if manifests, err = manifests.SetLabels(labels, manifest.NewResourceSelectorLabels(opts.TransformAllowList, opts.TransformDenylist)); err != nil {
 		return nil, err
 	}
-
-	if manifests, err = manifests.SetNamespace(ns, rs); err != nil {
-		return nil, err
+	// TODO(tejaldesai) consult with cloud deploy team if namespaces can be set in offline mode
+	// in case namespace is set on the skaffold render cli command.
+	if !opts.Offline {
+		if manifests, err = manifests.SetNamespace(ns, rs); err != nil {
+			return nil, err
+		}
+		endTrace()
 	}
-	endTrace()
-
 	var platforms manifest.PodPlatforms
 
 	if opts.EnableGKEARMNodeToleration && isGKECluster(opts.KubeContext) {