commit 9ebd597cd6e7bc7916c4fe568c916de87903c6f0 Author: Drew Walters Date: Mon Sep 28 14:10:07 2020 +0000 Add test-site phase overrides Phase documents live at the type level in Treasuremap; however, many test-site phases are defined at the site level. This change adds phase overrides to the test-site in order to demonstrate patching a phase path. The same process can be followed to add additional site-specific phases. Depends-On: https://review.opendev.org/754729 Change-Id: Ia4ede59c29752a71a17e3aad9118b496ba0d0233 diff --git a/manifests/site/test-site/metadata.yaml b/manifests/site/test-site/metadata.yaml new file mode 100644 index 0000000..a9b0fba --- /dev/null +++ b/manifests/site/test-site/metadata.yaml @@ -0,0 +1,2 @@ +phase: + path: manifests/site/test-site/phases diff --git a/manifests/site/test-site/phases/kustomization.yaml b/manifests/site/test-site/phases/kustomization.yaml new file mode 100644 index 0000000..532c428 --- /dev/null +++ b/manifests/site/test-site/phases/kustomization.yaml @@ -0,0 +1,5 @@ +resources: + - ../../../type/airship-core/phases + +patchesStrategicMerge: + - patch-entrypoints.yaml diff --git a/manifests/site/test-site/phases/patch-entrypoints.yaml b/manifests/site/test-site/phases/patch-entrypoints.yaml new file mode 100644 index 0000000..60fb0af --- /dev/null +++ b/manifests/site/test-site/phases/patch-entrypoints.yaml @@ -0,0 +1,32 @@ +--- +apiVersion: airshipit.org/v1alpha1 +kind: Phase +metadata: + name: initinfra-ephemeral + clusterName: ephemeral-cluster +config: + documentEntryPoint: manifests/site/test-site/ephemeral/initinfra +--- +apiVersion: airshipit.org/v1alpha1 +kind: Phase +metadata: + name: controlplane-ephemeral + clusterName: ephemeral-cluster +config: + documentEntryPoint: manifests/site/test-site/ephemeral/controlplane +--- +apiVersion: airshipit.org/v1alpha1 +kind: Phase +metadata: + name: initinfra-target + clusterName: target-cluster +config: + documentEntryPoint: manifests/site/test-site/target/initinfra +--- +apiVersion: airshipit.org/v1alpha1 +kind: Phase +metadata: + name: workers-target + clusterName: target-cluster +config: + documentEntryPoint: manifests/site/test-site/target/workers diff --git a/tools/deployment/22_test_configs.sh b/tools/deployment/22_test_configs.sh index a3ec15f..6b01be1 100755 --- a/tools/deployment/22_test_configs.sh +++ b/tools/deployment/22_test_configs.sh @@ -19,9 +19,10 @@ set -xe export AIRSHIPCTL_WS=${AIRSHIPCTL_WS:-$AIRSHIPCTL_PROJECT} export AIRSHIP_CONFIG_MANIFEST_DIRECTORY=${AIRSHIP_CONFIG_MANIFEST_DIRECTORY:-$TREASUREMAP_PROJECT} -export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"manifests/type/airship-core/metadata.yaml"} export AIRSHIP_SITE_NAME=${AIRSHIP_SITE_NAME:-"manifests/site/test-site"} +export AIRSHIP_CONFIG_METADATA_PATH=${AIRSHIP_CONFIG_METADATA_PATH:-"$AIRSHIP_SITE_NAME/metadata.yaml"} + cd ${AIRSHIPCTL_PROJECT} ./tools/deployment/22_test_configs.sh