From 5382c087091ac82f4249a06850b4bb1e8194066e Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Fri, 10 May 2024 14:23:24 +0100 Subject: [PATCH] Revert helm annotation on CRDs It seems like this approach will not work without setting other metadata for helm. Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- artifacts/crds/crds.yaml | 6 ------ artifacts/crds/iam.openfaas.com_jwtissuers.yaml | 1 - artifacts/crds/iam.openfaas.com_policies.yaml | 1 - artifacts/crds/iam.openfaas.com_roles.yaml | 1 - artifacts/crds/openfaas.com_functioningresses.yaml | 1 - artifacts/crds/openfaas.com_functions.yaml | 1 - artifacts/crds/openfaas.com_profiles.yaml | 1 - .../openfaas/templates/iam.openfaas.com_jwtissuers-crd.yaml | 1 - chart/openfaas/templates/iam.openfaas.com_policies-crd.yaml | 1 - chart/openfaas/templates/iam.openfaas.com_roles-crd.yaml | 1 - .../templates/openfaas.com_functioningresses-crd.yaml | 1 - chart/openfaas/templates/openfaas.com_functions-crd.yaml | 1 - chart/openfaas/templates/openfaas.com_profiles-crd.yaml | 1 - hack/update-crds.sh | 5 +++-- 14 files changed, 3 insertions(+), 20 deletions(-) diff --git a/artifacts/crds/crds.yaml b/artifacts/crds/crds.yaml index 4869ccbba2..6298943c77 100644 --- a/artifacts/crds/crds.yaml +++ b/artifacts/crds/crds.yaml @@ -5,7 +5,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: jwtissuers.iam.openfaas.com @@ -87,7 +86,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: policies.iam.openfaas.com @@ -185,7 +183,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: roles.iam.openfaas.com @@ -274,7 +271,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: functioningresses.openfaas.com @@ -439,7 +435,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: functions.openfaas.com @@ -636,7 +631,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: profiles.openfaas.com diff --git a/artifacts/crds/iam.openfaas.com_jwtissuers.yaml b/artifacts/crds/iam.openfaas.com_jwtissuers.yaml index b54eaa3f6f..5775ba515a 100644 --- a/artifacts/crds/iam.openfaas.com_jwtissuers.yaml +++ b/artifacts/crds/iam.openfaas.com_jwtissuers.yaml @@ -3,7 +3,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: jwtissuers.iam.openfaas.com diff --git a/artifacts/crds/iam.openfaas.com_policies.yaml b/artifacts/crds/iam.openfaas.com_policies.yaml index e7d0107e38..1fcb15cf6e 100644 --- a/artifacts/crds/iam.openfaas.com_policies.yaml +++ b/artifacts/crds/iam.openfaas.com_policies.yaml @@ -3,7 +3,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: policies.iam.openfaas.com diff --git a/artifacts/crds/iam.openfaas.com_roles.yaml b/artifacts/crds/iam.openfaas.com_roles.yaml index 97cac097bf..c3ee52282e 100644 --- a/artifacts/crds/iam.openfaas.com_roles.yaml +++ b/artifacts/crds/iam.openfaas.com_roles.yaml @@ -3,7 +3,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: roles.iam.openfaas.com diff --git a/artifacts/crds/openfaas.com_functioningresses.yaml b/artifacts/crds/openfaas.com_functioningresses.yaml index 98a4a1238c..4b93add891 100644 --- a/artifacts/crds/openfaas.com_functioningresses.yaml +++ b/artifacts/crds/openfaas.com_functioningresses.yaml @@ -3,7 +3,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: functioningresses.openfaas.com diff --git a/artifacts/crds/openfaas.com_functions.yaml b/artifacts/crds/openfaas.com_functions.yaml index af5fb7ab06..e0c89c40a2 100644 --- a/artifacts/crds/openfaas.com_functions.yaml +++ b/artifacts/crds/openfaas.com_functions.yaml @@ -3,7 +3,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: functions.openfaas.com diff --git a/artifacts/crds/openfaas.com_profiles.yaml b/artifacts/crds/openfaas.com_profiles.yaml index 95270b7a4e..11ff09ef4d 100644 --- a/artifacts/crds/openfaas.com_profiles.yaml +++ b/artifacts/crds/openfaas.com_profiles.yaml @@ -3,7 +3,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep labels: app.kubernetes.io/name: openfaas name: profiles.openfaas.com diff --git a/chart/openfaas/templates/iam.openfaas.com_jwtissuers-crd.yaml b/chart/openfaas/templates/iam.openfaas.com_jwtissuers-crd.yaml index 5a7c9e2887..79115d60dd 100644 --- a/chart/openfaas/templates/iam.openfaas.com_jwtissuers-crd.yaml +++ b/chart/openfaas/templates/iam.openfaas.com_jwtissuers-crd.yaml @@ -5,7 +5,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep name: jwtissuers.iam.openfaas.com spec: group: iam.openfaas.com diff --git a/chart/openfaas/templates/iam.openfaas.com_policies-crd.yaml b/chart/openfaas/templates/iam.openfaas.com_policies-crd.yaml index cde360b6cf..31a81659f4 100644 --- a/chart/openfaas/templates/iam.openfaas.com_policies-crd.yaml +++ b/chart/openfaas/templates/iam.openfaas.com_policies-crd.yaml @@ -5,7 +5,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep name: policies.iam.openfaas.com spec: group: iam.openfaas.com diff --git a/chart/openfaas/templates/iam.openfaas.com_roles-crd.yaml b/chart/openfaas/templates/iam.openfaas.com_roles-crd.yaml index a14bc9d044..9f4e0bcffa 100644 --- a/chart/openfaas/templates/iam.openfaas.com_roles-crd.yaml +++ b/chart/openfaas/templates/iam.openfaas.com_roles-crd.yaml @@ -5,7 +5,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep name: roles.iam.openfaas.com spec: group: iam.openfaas.com diff --git a/chart/openfaas/templates/openfaas.com_functioningresses-crd.yaml b/chart/openfaas/templates/openfaas.com_functioningresses-crd.yaml index 2a5a0d4545..c654fb0535 100644 --- a/chart/openfaas/templates/openfaas.com_functioningresses-crd.yaml +++ b/chart/openfaas/templates/openfaas.com_functioningresses-crd.yaml @@ -5,7 +5,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - helm.sh/resource-policy: keep name: functioningresses.openfaas.com spec: group: openfaas.com diff --git a/chart/openfaas/templates/openfaas.com_functions-crd.yaml b/chart/openfaas/templates/openfaas.com_functions-crd.yaml index c7637a3fa9..d75d27c84f 100644 --- a/chart/openfaas/templates/openfaas.com_functions-crd.yaml +++ b/chart/openfaas/templates/openfaas.com_functions-crd.yaml @@ -5,7 +5,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep name: functions.openfaas.com spec: group: openfaas.com diff --git a/chart/openfaas/templates/openfaas.com_profiles-crd.yaml b/chart/openfaas/templates/openfaas.com_profiles-crd.yaml index 1c9a599f40..31f7200e14 100644 --- a/chart/openfaas/templates/openfaas.com_profiles-crd.yaml +++ b/chart/openfaas/templates/openfaas.com_profiles-crd.yaml @@ -5,7 +5,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - helm.sh/resource-policy: keep name: profiles.openfaas.com spec: group: openfaas.com diff --git a/hack/update-crds.sh b/hack/update-crds.sh index 248bc82396..d8ceae6ca1 100755 --- a/hack/update-crds.sh +++ b/hack/update-crds.sh @@ -22,8 +22,9 @@ for f in ./artifacts/crds/*.yaml; do \ echo "Annotating & labelling: $f" tmp_file=$(mktemp) - kubectl annotate --overwrite -f $f --local=true -o yaml helm.sh/resource-policy=keep > tmp_file - mv tmp_file $f + # AE: This doesn't work without additional labels such as meta.helm.sh/release-name and app.kubernetes.io/managed-by + # kubectl annotate --overwrite -f $f --local=true -o yaml helm.sh/resource-policy=keep > tmp_file + # mv tmp_file $f kubectl label --overwrite -f $f --local=true -o yaml app.kubernetes.io/name=openfaas > tmp_file mv tmp_file $f