From 8357f28a6c546910dd5143ac8761b002e42730e4 Mon Sep 17 00:00:00 2001
From: Roberto Alfieri <ralfieri@redhat.com>
Date: Wed, 6 Mar 2024 18:08:47 +0100
Subject: [PATCH] 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] https://github.com/openstack-k8s-operators/architecture/pull/115

Signed-off-by: Roberto Alfieri <ralfieri@redhat.com>
---
 examples/common/olm/kustomization.yaml | 4 +++-
 examples/common/olm/values.yaml        | 9 +++++++++
 lib/olm-deps/kustomization.yaml        | 3 +++
 lib/olm-openstack/kustomization.yaml   | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 examples/common/olm/values.yaml

diff --git a/examples/common/olm/kustomization.yaml b/examples/common/olm/kustomization.yaml
index 6f3f6d5f0..ed9484041 100644
--- 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
new file mode 100644
index 000000000..c5400c30f
--- /dev/null
+++ 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
index 7110e6470..f6afffb0b 100644
--- 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
index 94eac74d8..9be7e3d01 100644
--- 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: