From b5d555e4eafca85671ccbd9083cc8f811c9560b3 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Thu, 18 Jul 2019 17:59:54 -0700 Subject: [PATCH] fix(kube): remove namespace enforcement This fixes an issue where resources that hardcode the metadata.namespace parameter cannot be installed. Signed-off-by: Matthew Fisher --- pkg/kube/client.go | 1 - pkg/kube/client_test.go | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 8df24bef5..2af142787 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -114,7 +114,6 @@ func (c *Client) newBuilder() *resource.Builder { ContinueOnError(). NamespaceParam(c.namespace()). DefaultNamespace(). - RequireNamespace(). Flatten() } diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index cd80d69d8..01008c819 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -193,6 +193,11 @@ func TestBuild(t *testing.T) { namespace: "test", reader: strings.NewReader(testInvalidServiceManifest), err: true, + }, { + name: "Valid input, deploying resources into different namespaces", + namespace: "test", + reader: strings.NewReader(namespacedGuestbookManifest), + count: 1, }, } @@ -444,3 +449,31 @@ spec: ports: - containerPort: 80 ` + +const namespacedGuestbookManifest = ` +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: frontend + namespace: guestbook +spec: + replicas: 3 + template: + metadata: + labels: + app: guestbook + tier: frontend + spec: + containers: + - name: php-redis + image: gcr.io/google-samples/gb-frontend:v4 + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + ports: + - containerPort: 80 +`