From 5fa88cae45534b39e4f981975c5990e2b0680d2c Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Thu, 6 May 2021 22:05:05 -0500
Subject: [PATCH] Decouple catalogues from phases

Current implementation does not allow to avoid inheriting from
airhipctl-base-catalogues in phases. This commit decouples phases
from catalogues allowing to declare cataloues down the stream.

Change-Id: Iffa064f196f2bd7fb8aaaa951adb521abfa541b5
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
---
 manifests/phases/kustomization.yaml                          | 2 --
 manifests/site/az-test-site/phases/kustomization.yaml        | 3 +++
 manifests/site/docker-test-site/phases/kustomization.yaml    | 3 +++
 manifests/site/gcp-test-site/phases/kustomization.yaml       | 3 +++
 manifests/site/openstack-test-site/phases/kustomization.yaml | 5 ++++-
 manifests/site/test-site/phases/kustomization.yaml           | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/manifests/phases/kustomization.yaml b/manifests/phases/kustomization.yaml
index 8b48bb484..6ee3147d2 100644
--- a/manifests/phases/kustomization.yaml
+++ b/manifests/phases/kustomization.yaml
@@ -4,13 +4,11 @@ resources:
   - executors.yaml
   - cluster-map.yaml
   - ../function/clusterctl
-  - ../function/airshipctl-base-catalogues
   # Scripts for generic containers
   - ../function/phase-helpers
 patchesStrategicMerge:
   - clusterctl_init_options.yaml
 transformers:
-  - ../function/clusterctl/replacements
   # NOTE(aostapenko) Consume AIRSHIPCTL_EPHEMERAL_ISO_URL here that will
   # have precedence over phase catalogue isoURL value
   - ../function/bootstrap
diff --git a/manifests/site/az-test-site/phases/kustomization.yaml b/manifests/site/az-test-site/phases/kustomization.yaml
index 3890dab2c..ed13ef0c1 100644
--- a/manifests/site/az-test-site/phases/kustomization.yaml
+++ b/manifests/site/az-test-site/phases/kustomization.yaml
@@ -1,5 +1,6 @@
 resources:
   - ../../../phases
+  - ../../function/airshipctl-base-catalogues
 patchesStrategicMerge:
   - plan.yaml
 patchesJson6902:
@@ -9,3 +10,5 @@ patchesJson6902:
       kind: Clusterctl
       name: "clusterctl_init"
     path: infrastructure-providers.json
+transformers:
+  - ../../../function/clusterctl/replacements
diff --git a/manifests/site/docker-test-site/phases/kustomization.yaml b/manifests/site/docker-test-site/phases/kustomization.yaml
index 3890dab2c..ed13ef0c1 100644
--- a/manifests/site/docker-test-site/phases/kustomization.yaml
+++ b/manifests/site/docker-test-site/phases/kustomization.yaml
@@ -1,5 +1,6 @@
 resources:
   - ../../../phases
+  - ../../function/airshipctl-base-catalogues
 patchesStrategicMerge:
   - plan.yaml
 patchesJson6902:
@@ -9,3 +10,5 @@ patchesJson6902:
       kind: Clusterctl
       name: "clusterctl_init"
     path: infrastructure-providers.json
+transformers:
+  - ../../../function/clusterctl/replacements
diff --git a/manifests/site/gcp-test-site/phases/kustomization.yaml b/manifests/site/gcp-test-site/phases/kustomization.yaml
index 3890dab2c..ed13ef0c1 100644
--- a/manifests/site/gcp-test-site/phases/kustomization.yaml
+++ b/manifests/site/gcp-test-site/phases/kustomization.yaml
@@ -1,5 +1,6 @@
 resources:
   - ../../../phases
+  - ../../function/airshipctl-base-catalogues
 patchesStrategicMerge:
   - plan.yaml
 patchesJson6902:
@@ -9,3 +10,5 @@ patchesJson6902:
       kind: Clusterctl
       name: "clusterctl_init"
     path: infrastructure-providers.json
+transformers:
+  - ../../../function/clusterctl/replacements
diff --git a/manifests/site/openstack-test-site/phases/kustomization.yaml b/manifests/site/openstack-test-site/phases/kustomization.yaml
index 11ee36d09..ed13ef0c1 100644
--- a/manifests/site/openstack-test-site/phases/kustomization.yaml
+++ b/manifests/site/openstack-test-site/phases/kustomization.yaml
@@ -1,5 +1,6 @@
 resources:
   - ../../../phases
+  - ../../function/airshipctl-base-catalogues
 patchesStrategicMerge:
   - plan.yaml
 patchesJson6902:
@@ -8,4 +9,6 @@ patchesJson6902:
       version: v1alpha1
       kind: Clusterctl
       name: "clusterctl_init"
-    path: infrastructure-providers.json
\ No newline at end of file
+    path: infrastructure-providers.json
+transformers:
+  - ../../../function/clusterctl/replacements
diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/test-site/phases/kustomization.yaml
index 9c0f2f0b6..d1c88e771 100644
--- a/manifests/site/test-site/phases/kustomization.yaml
+++ b/manifests/site/test-site/phases/kustomization.yaml
@@ -1,8 +1,10 @@
 resources:
   - ../kubeconfig
   - ../../../phases
+  - ../target/catalogues
   - catalogue.yaml
   - validation-config.yaml
 transformers:
+  - ../../../function/clusterctl/replacements
   - ../../../function/bootstrap/replacements
   - ../../../function/validator