From c6df58d76045db282ffc64b45b34a6015ca1efc3 Mon Sep 17 00:00:00 2001 From: Sirajudeen Date: Thu, 17 Jun 2021 17:16:55 +0000 Subject: [PATCH] Patch plan with type/site specific phases * Use patch to re-define the plan definition with required sequence of phases applicable to the specific type/site instead of defining a new plan. * The idea of this change is to have one unique plan for deployment 'deploy-gating' with its own definition per type/site. RelatesTo: #176 Change-Id: I162883dd2e86b709fbb483b985130e8748d8e557 --- manifests/type/airship-core/phases/kustomization.yaml | 3 ++- .../type/airship-core/phases/{plan.yaml => plan-patch.yaml} | 2 +- tools/deployment/airship-core/25_deploy_gating.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename manifests/type/airship-core/phases/{plan.yaml => plan-patch.yaml} (99%) diff --git a/manifests/type/airship-core/phases/kustomization.yaml b/manifests/type/airship-core/phases/kustomization.yaml index 8e942fb39..29fc2387c 100644 --- a/manifests/type/airship-core/phases/kustomization.yaml +++ b/manifests/type/airship-core/phases/kustomization.yaml @@ -5,6 +5,7 @@ resources: - ../../../function/phase-helper/ - executors.yaml - phases.yaml - - plan.yaml transformers: - ../../../../../airshipctl/manifests/function/validator +patchesStrategicMerge: + - plan-patch.yaml diff --git a/manifests/type/airship-core/phases/plan.yaml b/manifests/type/airship-core/phases/plan-patch.yaml similarity index 99% rename from manifests/type/airship-core/phases/plan.yaml rename to manifests/type/airship-core/phases/plan-patch.yaml index b657d51b0..26d716acd 100644 --- a/manifests/type/airship-core/phases/plan.yaml +++ b/manifests/type/airship-core/phases/plan-patch.yaml @@ -1,7 +1,7 @@ apiVersion: airshipit.org/v1alpha1 kind: PhasePlan metadata: - name: deploy-aiship-core-gating + name: deploy-gating description: "Phase plan for airship-core deployment on gating" phases: # Deploy ephemeral node using redfish with iso diff --git a/tools/deployment/airship-core/25_deploy_gating.sh b/tools/deployment/airship-core/25_deploy_gating.sh index 7880e4ba2..9484d7367 100755 --- a/tools/deployment/airship-core/25_deploy_gating.sh +++ b/tools/deployment/airship-core/25_deploy_gating.sh @@ -14,4 +14,4 @@ set -xe -airshipctl plan run deploy-aiship-core-gating --debug +airshipctl plan run deploy-gating --debug