Merge "Decouple catalogues from phases"

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

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

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

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

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
+    path: infrastructure-providers.json
+transformers:
+  - ../../../function/clusterctl/replacements

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