Merge pull request #587 from jetstack/VC-36589-include-crds-not-working

VC-36589: Helm's `--set crds.venafiConnection.include=true` not working on master

Author: inteon

deploy/charts/venafi-kubernetes-agent/crd_bases/crd.header-without-validations.yaml

@@ -0,0 +1,15 @@
+{{/* DO NOT EDIT. Use 'make generate-crds-venconn' to regenerate. */}}
+{{- if .Values.crds.venafiConnection.include }}
+{{- if (or (semverCompare "<1.25" .Capabilities.KubeVersion.GitVersion) .Values.crds.forceRemoveValidationAnnotations) }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: "venaficonnections.jetstack.io"
+  {{- if .Values.crds.keep }}
+  annotations:
+    # This annotation prevents the CRD from being pruned by Helm when this chart
+    # is deleted.
+    helm.sh/resource-policy: keep
+  {{- end }}
+  labels:
+  {{- include "venafi-connection.labels" . | nindent 4 }}

deploy/charts/venafi-kubernetes-agent/crd_bases/crd.header.yaml

@@ -1,6 +1,6 @@
 {{/* DO NOT EDIT. Use 'make generate-crds-venconn' to regenerate. */}}
 {{- if .Values.crds.venafiConnection.include }}
-{{- if (or (semverCompare "<1.25" .Capabilities.KubeVersion.GitVersion) .Values.crds.forceRemoveValidationAnnotations) }}
+{{- if not (or (semverCompare "<1.25" .Capabilities.KubeVersion.GitVersion) .Values.crds.forceRemoveValidationAnnotations) }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

deploy/charts/venafi-kubernetes-agent/crd_bases/jetstack.io_venaficonnections.yaml

@@ -1,3 +1,4 @@
+# DO NOT EDIT: Use 'make generate-crds-venconn' to regenerate.
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

deploy/charts/venafi-kubernetes-agent/templates/venafi-connection-crd.without-validations.yaml

@@ -13,13 +13,6 @@ metadata:
   {{- end }}
   labels:
   {{- include "venafi-connection.labels" . | nindent 4 }}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
-  name: venaficonnections.jetstack.io
 spec:
   group: jetstack.io
   names:

deploy/charts/venafi-kubernetes-agent/templates/venafi-connection-crd.yaml

@@ -1,6 +1,6 @@
 {{/* DO NOT EDIT. Use 'make generate-crds-venconn' to regenerate. */}}
 {{- if .Values.crds.venafiConnection.include }}
-{{- if (or (semverCompare "<1.25" .Capabilities.KubeVersion.GitVersion) .Values.crds.forceRemoveValidationAnnotations) }}
+{{- if not (or (semverCompare "<1.25" .Capabilities.KubeVersion.GitVersion) .Values.crds.forceRemoveValidationAnnotations) }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -13,13 +13,6 @@ metadata:
   {{- end }}
   labels:
   {{- include "venafi-connection.labels" . | nindent 4 }}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
-  name: venaficonnections.jetstack.io
 spec:
   group: jetstack.io
   names:

make/02_mod.mk

@@ -27,16 +27,17 @@ release: $(helm_chart_archive)
 generate-crds-venconn: $(addprefix $(helm_chart_source_dir)/templates/,venafi-connection-crd.yaml venafi-connection-crd.without-validations.yaml)
 
 $(helm_chart_source_dir)/crd_bases/jetstack.io_venaficonnections.yaml: go.mod | $(NEEDS_GO)
-	$(GO) run ./make/connection_crd >$@
+	echo "# DO NOT EDIT: Use 'make generate-crds-venconn' to regenerate." >$@
+	$(GO) run ./make/connection_crd >>$@
 
 $(helm_chart_source_dir)/templates/venafi-connection-crd.without-validations.yaml: $(helm_chart_source_dir)/crd_bases/jetstack.io_venaficonnections.yaml $(helm_chart_source_dir)/crd_bases/crd.header.yaml $(helm_chart_source_dir)/crd_bases/crd.footer.yaml | $(NEEDS_YQ)
-	cat $(helm_chart_source_dir)/crd_bases/crd.header.yaml >$@
-	$(YQ) 'del(.. | ."x-kubernetes-validations"?) | del(.metadata.creationTimestamp)' $< | grep -v "DO NOT EDIT" >>$@
+	cat $(helm_chart_source_dir)/crd_bases/crd.header-without-validations.yaml >$@
+	$(YQ) -I2 '{"spec": .spec}' $< | $(YQ) 'del(.. | ."x-kubernetes-validations"?) | del(.metadata.creationTimestamp)' | grep -v "DO NOT EDIT" >>$@
 	cat $(helm_chart_source_dir)/crd_bases/crd.footer.yaml >>$@
 
 $(helm_chart_source_dir)/templates/venafi-connection-crd.yaml: $(helm_chart_source_dir)/crd_bases/jetstack.io_venaficonnections.yaml $(helm_chart_source_dir)/crd_bases/crd.header.yaml $(helm_chart_source_dir)/crd_bases/crd.footer.yaml | $(NEEDS_YQ)
 	cat $(helm_chart_source_dir)/crd_bases/crd.header.yaml >$@
-	$(YQ) 'del(.metadata.creationTimestamp)' $< | grep -v "DO NOT EDIT" >>$@
+	$(YQ) -I2 '{"spec": .spec}' $< | $(YQ) 'del(.metadata.creationTimestamp)' | grep -v "DO NOT EDIT" >>$@
 	cat $(helm_chart_source_dir)/crd_bases/crd.footer.yaml >>$@
 
 # The generate-crds target doesn't need to be run anymore when running