From 956e344f835a80614c05ae83b22ac3cff087d5ed Mon Sep 17 00:00:00 2001 From: adam_buran Date: Tue, 29 Oct 2024 10:04:19 -0700 Subject: [PATCH 1/2] add resource-policy annotations to crds Signed-off-by: adam_buran --- helm/aws-load-balancer-controller/crds/crds.yaml | 14 ++++++++++++++ helm/aws-load-balancer-controller/values.yaml | 9 +++++++++ 2 files changed, 23 insertions(+) diff --git a/helm/aws-load-balancer-controller/crds/crds.yaml b/helm/aws-load-balancer-controller/crds/crds.yaml index 048d51e84..768508a96 100644 --- a/helm/aws-load-balancer-controller/crds/crds.yaml +++ b/helm/aws-load-balancer-controller/crds/crds.yaml @@ -1,8 +1,15 @@ +{{- if .Values.crds.install }} apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 + {{- if .Values.crds.keep }} + "helm.sh/resource-policy": keep + {{- end }} + {{- with .Values.crds.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} name: ingressclassparams.elbv2.k8s.aws spec: group: elbv2.k8s.aws @@ -244,6 +251,12 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 + {{- if .Values.crds.keep }} + "helm.sh/resource-policy": keep + {{- end }} + {{- with .Values.crds.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} name: targetgroupbindings.elbv2.k8s.aws spec: group: elbv2.k8s.aws @@ -657,3 +670,4 @@ spec: storage: true subresources: status: {} +{{- end }} \ No newline at end of file diff --git a/helm/aws-load-balancer-controller/values.yaml b/helm/aws-load-balancer-controller/values.yaml index 1be4b62d2..42d1a9ee8 100644 --- a/helm/aws-load-balancer-controller/values.yaml +++ b/helm/aws-load-balancer-controller/values.yaml @@ -430,3 +430,12 @@ loadBalancerClass: # creator will disable helm default labels, so you can only add yours # creator: "me" + +# custom resource definitions configuration +crds: + # retain CRDs upon chart uninstall + keep: true + # install CRDs + install: true + # pass in annotations to CRDs + annotations: {} \ No newline at end of file From db91da097776c7613717cb45ee475b95b030b3a9 Mon Sep 17 00:00:00 2001 From: Adam Buran Date: Wed, 20 Nov 2024 22:01:31 -0800 Subject: [PATCH 2/2] no-op Signed-off-by: Adam Buran --- helm/aws-load-balancer-controller/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helm/aws-load-balancer-controller/values.yaml b/helm/aws-load-balancer-controller/values.yaml index 42d1a9ee8..8e5b6ac02 100644 --- a/helm/aws-load-balancer-controller/values.yaml +++ b/helm/aws-load-balancer-controller/values.yaml @@ -438,4 +438,5 @@ crds: # install CRDs install: true # pass in annotations to CRDs - annotations: {} \ No newline at end of file + annotations: {} + \ No newline at end of file