Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert helm annotation on CRDs
Browse files Browse the repository at this point in the history
It seems like this approach will not work without setting
other metadata for helm.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
alexellis committed May 10, 2024
1 parent 3e36466 commit 5382c08
Showing 14 changed files with 3 additions and 20 deletions.
6 changes: 0 additions & 6 deletions artifacts/crds/crds.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion artifacts/crds/iam.openfaas.com_jwtissuers.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion artifacts/crds/iam.openfaas.com_policies.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion artifacts/crds/iam.openfaas.com_roles.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion artifacts/crds/openfaas.com_functioningresses.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion artifacts/crds/openfaas.com_functions.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion artifacts/crds/openfaas.com_profiles.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion chart/openfaas/templates/iam.openfaas.com_roles-crd.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion chart/openfaas/templates/openfaas.com_functions-crd.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion chart/openfaas/templates/openfaas.com_profiles-crd.yaml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions hack/update-crds.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 5382c08

Please sign in to comment.