Temporary fix up for namespace generation issue

bitnami-labs · May 10, 2018 · e36869b · e36869b
1 parent 594db0c
commit e36869b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -54,12 +54,13 @@ controller.image: docker/Dockerfile docker/controller
 	mv $@.tmp $@
 
 %.yaml: %.jsonnet
-	$(KUBECFG) show -V CONTROLLER_IMAGE=$(CONTROLLER_IMAGE) -o yaml $< > $@.tmp
+	cat namespace.yaml > $@.tmp # TODO remove when comments at https://github.com/bitnami-labs/sealed-secrets/pull/99#issuecomment-387962489 resolved
+	$(KUBECFG) show -V CONTROLLER_IMAGE=$(CONTROLLER_IMAGE) -o yaml $< >> $@.tmp
 	mv $@.tmp $@
 
-controller.yaml: controller.jsonnet controller.image controller-norbac.jsonnet
+controller.yaml: controller.jsonnet controller.image controller-norbac.jsonnet namespace.yaml
 
-controller-norbac.yaml: controller-norbac.jsonnet controller.image
+controller-norbac.yaml: controller-norbac.jsonnet controller.image namespace.yaml
 
 test:
 	$(GO) test $(GO_FLAGS) $(GO_PACKAGES)

diff --git a/controller-norbac.jsonnet b/controller-norbac.jsonnet
@@ -25,7 +25,8 @@ local v1beta1_Deployment(name) = kube.Deployment(name) {
 {
   namespace:: {metadata+: {namespace: namespace}},
 
-  ns: kube.Namespace($.namespace.metadata.namespace),
+  // TODO uncomment when comments at https://github.com/bitnami-labs/sealed-secrets/pull/99#issuecomment-387962489 resolved
+  // ns: kube.Namespace($.namespace.metadata.namespace),
 
   service: kube.Service("sealed-secrets-controller") + $.namespace {
     target_pod: $.controller.spec.template,

diff --git a/namespace.yaml b/namespace.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations: {}
+  labels:
+    name: sealed-secrets
+  name: sealed-secrets