Skip to content

Commit

Permalink
fix: always add namespaces in generated manifests regardless of offli…
Browse files Browse the repository at this point in the history
…ne=[true|false]
  • Loading branch information
aaron-prindle committed Nov 20, 2022
1 parent 865a51a commit 15afbfd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
5 changes: 5 additions & 0 deletions pkg/skaffold/deploy/kubectl/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const DeploymentWebYAML = `apiVersion: v1
kind: Pod
metadata:
name: leeroy-web
namespace: default
spec:
containers:
- name: leeroy-web
Expand All @@ -35,6 +36,7 @@ const DeploymentWebYAMLv1 = `apiVersion: v1
kind: Pod
metadata:
name: leeroy-web
namespace: default
spec:
containers:
- image: leeroy-web:v1
Expand All @@ -44,6 +46,7 @@ const DeploymentAppYAML = `apiVersion: v1
kind: Pod
metadata:
name: leeroy-app
namespace: default
spec:
containers:
- name: leeroy-app
Expand All @@ -53,6 +56,7 @@ const DeploymentAppYAMLv1 = `apiVersion: v1
kind: Pod
metadata:
name: leeroy-app
namespace: default
spec:
containers:
- image: leeroy-app:v1
Expand All @@ -62,6 +66,7 @@ const DeploymentAppYAMLv2 = `apiVersion: v1
kind: Pod
metadata:
name: leeroy-app
namespace: default
spec:
containers:
- image: leeroy-app:v2
Expand Down
12 changes: 5 additions & 7 deletions pkg/skaffold/render/renderer/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,12 @@ 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
}
// 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()

if manifests, err = manifests.SetNamespace(ns, rs); err != nil {
return nil, err
}
endTrace()

var platforms manifest.PodPlatforms

if opts.EnableGKEARMNodeToleration && isGKECluster(opts.KubeContext) {
Expand Down

0 comments on commit 15afbfd

Please sign in to comment.