Merge pull request #503 from k8s-infra-cherrypick-robot/cherry-pick-5…

…00-to-release-0.10

[release-0.10] Add helm.sh/resource-policy: keep to CRDs to prevent deletion

config/chart/kustomization.yaml

@@ -23,6 +23,11 @@ bases:
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 #- ../prometheus
 
+patches:
+- path: patches/keep-crds.yaml
+ target:
+ kind: CustomResourceDefinition
+
 patchesStrategicMerge:
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
 # Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.

config/chart/patches/keep-crds.yaml

@@ -0,0 +1,6 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+ annotations:
+ "helm.sh/resource-policy": keep
+ name: any

test/e2e/resources/full-chart-install.yaml

@@ -6,6 +6,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert'
  controller-gen.kubebuilder.io/version: v0.14.0
+ helm.sh/resource-policy: keep
  labels:
  clusterctl.cluster.x-k8s.io/core: capi-operator
  name: addonproviders.operator.cluster.x-k8s.io
@@ -1623,6 +1624,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert'
  controller-gen.kubebuilder.io/version: v0.14.0
+ helm.sh/resource-policy: keep
  labels:
  clusterctl.cluster.x-k8s.io/core: capi-operator
  name: bootstrapproviders.operator.cluster.x-k8s.io
@@ -4825,6 +4827,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert'
  controller-gen.kubebuilder.io/version: v0.14.0
+ helm.sh/resource-policy: keep
  labels:
  clusterctl.cluster.x-k8s.io/core: capi-operator
  name: controlplaneproviders.operator.cluster.x-k8s.io
@@ -8030,6 +8033,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert'
  controller-gen.kubebuilder.io/version: v0.14.0
+ helm.sh/resource-policy: keep
  labels:
  clusterctl.cluster.x-k8s.io/core: capi-operator
  name: coreproviders.operator.cluster.x-k8s.io
@@ -11232,6 +11236,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert'
  controller-gen.kubebuilder.io/version: v0.14.0
+ helm.sh/resource-policy: keep
  labels:
  clusterctl.cluster.x-k8s.io/core: capi-operator
  name: infrastructureproviders.operator.cluster.x-k8s.io
@@ -14437,6 +14442,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert'
  controller-gen.kubebuilder.io/version: v0.14.0
+ helm.sh/resource-policy: keep
  labels:
  clusterctl.cluster.x-k8s.io/core: capi-operator
  name: ipamproviders.operator.cluster.x-k8s.io
@@ -16054,6 +16060,7 @@ metadata:
  annotations:
  cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert'
  controller-gen.kubebuilder.io/version: v0.14.0
+ helm.sh/resource-policy: keep
  labels:
  clusterctl.cluster.x-k8s.io/core: capi-operator
  name: runtimeextensionproviders.operator.cluster.x-k8s.io