Move openstack-operator-version variable to olm-values CM

This is a followup to #115 [1] since that approach failed while deploying OLM resources. Also, `openstack-operator-version` variable has been moved to a new CM called `olm-values` [1] #115 Signed-off-by: Roberto Alfieri <[email protected]>
openstack-k8s-operators · Mar 6, 2024 · 8357f28 · 8357f28
1 parent 1904f47
commit 8357f28
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/examples/common/olm/kustomization.yaml b/examples/common/olm/kustomization.yaml
@@ -1,3 +1,5 @@
-resources:
+components:
   - ../../../lib/olm-deps
   - ../../../lib/olm-openstack
+resources:
+  - values.yaml
diff --git a/examples/common/olm/values.yaml b/examples/common/olm/values.yaml
@@ -0,0 +1,9 @@
+# local-config: referenced, but not emitted by kustomize
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: olm-values
+  annotations:
+    config.kubernetes.io/local-config: "true"
+data:
+  openstack-operator-image: "quay.io/openstack-k8s-operators/openstack-operator-index:latest"
diff --git a/lib/olm-deps/kustomization.yaml b/lib/olm-deps/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
 resources:
 - cert_manager_namespace.yaml
 - cert_manager_operatorgroup.yaml

diff --git a/lib/olm-openstack/kustomization.yaml b/lib/olm-openstack/kustomization.yaml
@@ -10,7 +10,7 @@ resources:
 replacements:
 - source:
     kind: ConfigMap
-    name: network-values
+    name: olm-values
     fieldPath: data.openstack-operator-image
   targets:
   - select: