WIP: layer helm values files

tmshort · tmshort · commit ee32909670b3 · 2025-07-21T16:42:05.000-04:00
Signed-off-by: Todd Short &lt;tshort@redhat.com&gt;
diff --git a/Makefile b/Makefile
@@ -163,10 +163,10 @@ manifests: $(CONTROLLER_GEN) $(KUSTOMIZE) #EXHELP Generate WebhookConfiguration,
 	./hack/tools/patch-base-for-helm.sh
 	# Generate manifests stored in source-control
 	mkdir -p $(MANIFEST_HOME)
-	helm template olmv1 helm/olmv1 --values helm/standard.yaml > $(STANDARD_MANIFEST)
-	helm template olmv1 helm/olmv1 --values helm/standard-e2e.yaml > $(STANDARD_E2E_MANIFEST)
+	helm template olmv1 helm/olmv1 > $(STANDARD_MANIFEST)
+	helm template olmv1 helm/olmv1 --values helm/e2e.yaml > $(STANDARD_E2E_MANIFEST)
 	helm template olmv1 helm/olmv1 --values helm/experimental.yaml > $(EXPERIMENTAL_MANIFEST)
-	helm template olmv1 helm/olmv1 --values helm/experimental-e2e.yaml > $(EXPERIMENTAL_E2E_MANIFEST)
+	helm template olmv1 helm/olmv1 --values helm/experimental.yaml --values helm/e2e.yaml > $(EXPERIMENTAL_E2E_MANIFEST)
 
 .PHONY: generate
 generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
diff --git a/helm/e2e.yaml b/helm/e2e.yaml
@@ -1,11 +1,8 @@
-# Default values for operator-controller.
+# e2e values for OLMv1.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 # List of components to include
 components:
   e2e:
     enabled: true
-
-# This can be one of: standard or  experimental
-featureSet: standard
diff --git a/helm/experimental-e2e.yaml b/helm/experimental-e2e.yaml
diff --git a/helm/experimental.yaml b/helm/experimental.yaml
@@ -1,4 +1,4 @@
-# Default values for operator-controller.
+# experimental values for OLMv1.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
diff --git a/helm/olmv1/values.yaml b/helm/olmv1/values.yaml
@@ -1,4 +1,4 @@
-# Default values for operator-controller.
+# Default values for OLMv1.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
diff --git a/helm/standard.yaml b/helm/standard.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Default values for operator-controller.`
	`1`	`+# experimental values for OLMv1.`
`2`	`2`	`# This is a YAML-formatted file.`
`3`	`3`	`# Declare variables to be passed into your templates.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Default values for operator-controller.`
	`1`	`+# Default values for OLMv1.`
`2`	`2`	`# This is a YAML-formatted file.`
`3`	`3`	`# Declare variables to be passed into your templates.`
`4`	`4`