From 6a273adf95cd1f13e94bb61496a4e3a7ba274107 Mon Sep 17 00:00:00 2001 From: Ratnopam Chakrabarti Date: Tue, 8 Jun 2021 19:14:16 +0000 Subject: [PATCH] Fix Provider Test Site Kustomization Errors Due to change [1] and [2], deployment of capd is broken and resulting in kustomization errors as reported in https://github.com/airshipit/airshipctl/issues/565. This PS fixes the kustomization errors related to phasePlan and function entrypoints for capd, capg, capz and capo providers. [1]: https://review.opendev.org/c/airship/airshipctl/+/790202 [2]: https://review.opendev.org/c/airship/airshipctl/+/791715 Relates-To: #565 Closes: #565 Change-Id: Ia680131f4d1c43643e05f413dee649aa5011f793 --- 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 | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/manifests/site/az-test-site/phases/kustomization.yaml b/manifests/site/az-test-site/phases/kustomization.yaml index ed13ef0c1..e66ec6ce6 100644 --- a/manifests/site/az-test-site/phases/kustomization.yaml +++ b/manifests/site/az-test-site/phases/kustomization.yaml @@ -1,7 +1,6 @@ resources: - ../../../phases - - ../../function/airshipctl-base-catalogues -patchesStrategicMerge: + - ../../../function/airshipctl-base-catalogues - plan.yaml patchesJson6902: - target: diff --git a/manifests/site/docker-test-site/phases/kustomization.yaml b/manifests/site/docker-test-site/phases/kustomization.yaml index ed13ef0c1..e66ec6ce6 100644 --- a/manifests/site/docker-test-site/phases/kustomization.yaml +++ b/manifests/site/docker-test-site/phases/kustomization.yaml @@ -1,7 +1,6 @@ resources: - ../../../phases - - ../../function/airshipctl-base-catalogues -patchesStrategicMerge: + - ../../../function/airshipctl-base-catalogues - plan.yaml patchesJson6902: - target: diff --git a/manifests/site/gcp-test-site/phases/kustomization.yaml b/manifests/site/gcp-test-site/phases/kustomization.yaml index ed13ef0c1..e66ec6ce6 100644 --- a/manifests/site/gcp-test-site/phases/kustomization.yaml +++ b/manifests/site/gcp-test-site/phases/kustomization.yaml @@ -1,7 +1,6 @@ resources: - ../../../phases - - ../../function/airshipctl-base-catalogues -patchesStrategicMerge: + - ../../../function/airshipctl-base-catalogues - plan.yaml patchesJson6902: - target: diff --git a/manifests/site/openstack-test-site/phases/kustomization.yaml b/manifests/site/openstack-test-site/phases/kustomization.yaml index ed13ef0c1..e66ec6ce6 100644 --- a/manifests/site/openstack-test-site/phases/kustomization.yaml +++ b/manifests/site/openstack-test-site/phases/kustomization.yaml @@ -1,7 +1,6 @@ resources: - ../../../phases - - ../../function/airshipctl-base-catalogues -patchesStrategicMerge: + - ../../../function/airshipctl-base-catalogues - plan.yaml patchesJson6902: - target: