diff --git a/manifests/phases/kustomization.yaml b/manifests/phases/kustomization.yaml index 0f7d43bb0..90ffb6456 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