Skip to content

Commit 145928d

Browse files
Merge pull request #296 from inteon/crd_condition
Make CRD condition expression configurable
2 parents 1a768a4 + 7fe1087 commit 145928d

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

modules/helm/crd.template.header.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.crds.enabled }}
1+
{{- if REPLACE_CRD_EXPRESSION }}
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:

modules/helm/crds.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ endif
3939

4040
crds_dir ?= deploy/crds
4141
crds_dir_readme := $(dir $(lastword $(MAKEFILE_LIST)))/crds_dir.README.md
42+
crds_expression ?= .Values.crds.enabled
4243

4344
.PHONY: generate-crds
4445
## Generate CRD manifests.
@@ -60,6 +61,7 @@ generate-crds: | $(NEEDS_CONTROLLER-GEN) $(NEEDS_YQ)
6061
crd_name=$$($(YQ) eval '.metadata.name' $(crds_gen_temp)/$$i); \
6162
cat $(crd_template_header) > $(helm_chart_source_dir)/templates/crd-$$i; \
6263
echo "" >> $(helm_chart_source_dir)/templates/crd-$$i; \
64+
$(sed_inplace) "s/REPLACE_CRD_EXPRESSION/$(crds_expression)/g" $(helm_chart_source_dir)/templates/crd-$$i; \
6365
$(sed_inplace) "s/REPLACE_CRD_NAME/$$crd_name/g" $(helm_chart_source_dir)/templates/crd-$$i; \
6466
$(sed_inplace) "s/REPLACE_LABELS_TEMPLATE/$(helm_labels_template_name)/g" $(helm_chart_source_dir)/templates/crd-$$i; \
6567
$(YQ) -I2 '{"spec": .spec}' $(crds_gen_temp)/$$i >> $(helm_chart_source_dir)/templates/crd-$$i; \

0 commit comments

Comments
 (0)