Merge pull request #264 from vmware-tanzu/packaging-global-ann

add overlay to automatically add packaging global ann
carvel-dev · Jul 1, 2021 · 0356add · 0356add
2 parents 83bdfcb + 49d94ce
commit 0356add
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/config/crds.yml b/config/crds.yml
@@ -993,6 +993,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: packagerepositories.packaging.carvel.dev
+  annotations:
+    packaging.carvel.dev/global-namespace: kapp-controller-packaging-global
 spec:
   group: packaging.carvel.dev
   names:

diff --git a/hack/crd-overlay.yml b/hack/crd-overlay.yml
@@ -1,4 +1,6 @@
 #@ load("@ytt:overlay", "overlay")
+#@ load("@ytt:data", "data")
+
 #@overlay/match by=overlay.subset({"kind": "CustomResourceDefinition"}), expects="0+"
 ---
 metadata:
@@ -29,3 +31,10 @@ metadata:
 spec:
   names:
     plural: internalpackagemetadatas
+
+#@overlay/match by=overlay.subset({"metadata":{"name":"packagerepositories.packaging.carvel.dev"}})
+---
+metadata:
+  #@overlay/match missing_ok=True
+  annotations:
+    packaging.carvel.dev/global-namespace: #@ data.values.packaging_global_namespace
diff --git a/hack/gen-crds.sh b/hack/gen-crds.sh
@@ -11,6 +11,6 @@ go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \
   output:dir=./tmp/crds \
   paths=./pkg/apis/...
 
-ytt -f tmp/crds -f ./hack/crd-overlay.yml > config/crds.yml
+ytt -f tmp/crds -f ./hack/crd-overlay.yml -f ./config/values.yml > config/crds.yml
 
 rm -rf tmp/crds