From a84f980a214ef00b0db74000378048e38e5b50ac Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Thu, 20 May 2021 05:28:11 +0000 Subject: [PATCH] Fix incorrect reference-airship-core type refs Some phase entrypoints were missing in the multi-tenant type when the baremetal reference-multi-tenant-site was created. When the multi-tenant type was disassociated from the airship-core type [0], those entrypoints were created and added to all virtual sites; however, the reference multi-tenant site was not updated. This change fixes those references in the reference-multi-tenant site. [0] https://review.opendev.org/c/airship/treasuremap/+/786888 Signed-off-by: Drew Walters Change-Id: Icc346615a1a6de9cfd4a93e9b8a89a4cd0a640e0 --- .../ephemeral/initinfra-networking/kustomization.yaml | 2 +- .../target/encrypted/generator/kustomization.yaml | 4 ++-- .../target/encrypted/importer/kustomization.yaml | 2 +- .../target/encrypted/results/kustomization.yaml | 6 +++--- .../target/initinfra-networking/kustomization.yaml | 2 +- .../target/initinfra/kustomization.yaml | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/site/reference-multi-tenant/ephemeral/initinfra-networking/kustomization.yaml b/manifests/site/reference-multi-tenant/ephemeral/initinfra-networking/kustomization.yaml index 75c3dbd13..5403a38e4 100644 --- a/manifests/site/reference-multi-tenant/ephemeral/initinfra-networking/kustomization.yaml +++ b/manifests/site/reference-multi-tenant/ephemeral/initinfra-networking/kustomization.yaml @@ -1,2 +1,2 @@ resources: - - ../../../../type/airship-core/ephemeral/initinfra-networking + - ../../../../type/multi-tenant/ephemeral/initinfra-networking diff --git a/manifests/site/reference-multi-tenant/target/encrypted/generator/kustomization.yaml b/manifests/site/reference-multi-tenant/target/encrypted/generator/kustomization.yaml index 68f07be46..2054c19db 100644 --- a/manifests/site/reference-multi-tenant/target/encrypted/generator/kustomization.yaml +++ b/manifests/site/reference-multi-tenant/target/encrypted/generator/kustomization.yaml @@ -1,4 +1,4 @@ generators: -- ../../../../../type/airship-core/target/generator/ +- ../../../../../type/multi-tenant/target/generator/ transformers: -- ../../../../../type/airship-core/target/generator/fileplacement/ +- ../../../../../type/multi-tenant/target/generator/fileplacement/ diff --git a/manifests/site/reference-multi-tenant/target/encrypted/importer/kustomization.yaml b/manifests/site/reference-multi-tenant/target/encrypted/importer/kustomization.yaml index 222ae6ae9..6e0936697 100644 --- a/manifests/site/reference-multi-tenant/target/encrypted/importer/kustomization.yaml +++ b/manifests/site/reference-multi-tenant/target/encrypted/importer/kustomization.yaml @@ -1,4 +1,4 @@ resources: - ../results/imported/ transformers: - - ../../../../../type/airship-core/target/importer/fileplacement/ + - ../../../../../type/multi-tenant/target/importer/fileplacement/ diff --git a/manifests/site/reference-multi-tenant/target/encrypted/results/kustomization.yaml b/manifests/site/reference-multi-tenant/target/encrypted/results/kustomization.yaml index 4d5611c68..5e4180990 100644 --- a/manifests/site/reference-multi-tenant/target/encrypted/results/kustomization.yaml +++ b/manifests/site/reference-multi-tenant/target/encrypted/results/kustomization.yaml @@ -3,6 +3,6 @@ resources: - imported/ transformers: - - ../../../../../type/airship-core/target/decrypt-secrets/ - - ../../../../../type/airship-core/target/generator/fileplacement/ - - ../../../../../type/airship-core/target/importer/fileplacement/ + - ../../../../../type/multi-tenant/target/decrypt-secrets/ + - ../../../../../type/multi-tenant/target/generator/fileplacement/ + - ../../../../../type/multi-tenant/target/importer/fileplacement/ diff --git a/manifests/site/reference-multi-tenant/target/initinfra-networking/kustomization.yaml b/manifests/site/reference-multi-tenant/target/initinfra-networking/kustomization.yaml index 411ba4f89..70d812459 100644 --- a/manifests/site/reference-multi-tenant/target/initinfra-networking/kustomization.yaml +++ b/manifests/site/reference-multi-tenant/target/initinfra-networking/kustomization.yaml @@ -1,2 +1,2 @@ resources: - - ../../../../type/airship-core/target/initinfra-networking + - ../../../../type/multi-tenant/target/initinfra-networking diff --git a/manifests/site/reference-multi-tenant/target/initinfra/kustomization.yaml b/manifests/site/reference-multi-tenant/target/initinfra/kustomization.yaml index 5669403d8..0d35ff192 100644 --- a/manifests/site/reference-multi-tenant/target/initinfra/kustomization.yaml +++ b/manifests/site/reference-multi-tenant/target/initinfra/kustomization.yaml @@ -1,7 +1,7 @@ resources: - - ../../../../type/airship-core/target/initinfra + - ../../../../type/multi-tenant/target/initinfra - ../catalogues transformers: - - ../../../../type/airship-core/target/initinfra/replacements + - ../../../../type/multi-tenant/target/initinfra/replacements - ../../../../../../airshipctl/manifests/function/flux/source-controller/replacements - ../../../../../../airshipctl/manifests/function/flux/helm-controller/replacements