From ed15da7b3b91d8bd8be136298ea20ccd105f3943 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Thu, 11 Mar 2021 15:40:51 +0000 Subject: [PATCH] Fix ingress replacements and catalogue inheritance The ingress function replacements are applied at the type level in Treasuremap, against common conventions. This has created inheritance challenges because its replacements are from the airshipctl versions catalogue. This change moves the application of the ingress replacements to the site level and fixes the version catalogue inheritance. Signed-off-by: Drew Walters Change-Id: I24254fb36c5a9e2b2116edd0d67ac7f11725a65f --- .../site/test-site/ephemeral/catalogues/cleanup/smp.yaml | 6 ++++++ .../site/test-site/target/catalogues/cleanup/smp.yaml | 6 ++++++ .../site/test-site/target/workload/kustomization.yaml | 3 +++ .../bootstrap/hostgenerator/patch-delete-catalogues.yaml | 6 ++++++ .../ephemeral/catalogues/cleanup/smp.yaml | 6 ++++++ .../hostgenerator/patch-delete-catalogues.yaml | 6 ++++++ .../target/catalogues/cleanup/smp.yaml | 6 ++++++ .../workers/hostgenerator/patch-delete-catalogues.yaml | 8 +++++++- .../target/workload/kustomization.yaml | 5 ++++- .../airship-core/shared/catalogues/kustomization.yaml | 1 + .../type/airship-core/target/workload/kustomization.yaml | 4 ---- .../multi-tenant/shared/catalogues/kustomization.yaml | 1 - 12 files changed, 51 insertions(+), 7 deletions(-) diff --git a/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml b/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml index f8af103d2..be71de4c6 100644 --- a/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml +++ b/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml @@ -27,3 +27,9 @@ patches: |- metadata: name: versions-airshipctl $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VersionsCatalogue + metadata: + name: versions-treasuremap + $patch: delete diff --git a/manifests/site/test-site/target/catalogues/cleanup/smp.yaml b/manifests/site/test-site/target/catalogues/cleanup/smp.yaml index f8af103d2..be71de4c6 100644 --- a/manifests/site/test-site/target/catalogues/cleanup/smp.yaml +++ b/manifests/site/test-site/target/catalogues/cleanup/smp.yaml @@ -27,3 +27,9 @@ patches: |- metadata: name: versions-airshipctl $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VersionsCatalogue + metadata: + name: versions-treasuremap + $patch: delete diff --git a/manifests/site/test-site/target/workload/kustomization.yaml b/manifests/site/test-site/target/workload/kustomization.yaml index bf8114060..1f16e8c1c 100644 --- a/manifests/site/test-site/target/workload/kustomization.yaml +++ b/manifests/site/test-site/target/workload/kustomization.yaml @@ -1,2 +1,5 @@ resources: - ../../../../type/airship-core/target/workload + - ../catalogues +transformers: + - ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml index cf207361f..8d078e28e 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml @@ -33,3 +33,9 @@ patches: |- metadata: name: versions-airshipctl $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VersionsCatalogue + metadata: + name: versions-treasuremap + $patch: delete diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml b/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml index f8af103d2..be71de4c6 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml @@ -27,3 +27,9 @@ patches: |- metadata: name: versions-airshipctl $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VersionsCatalogue + metadata: + name: versions-treasuremap + $patch: delete diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml index cf207361f..8d078e28e 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml @@ -33,3 +33,9 @@ patches: |- metadata: name: versions-airshipctl $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VersionsCatalogue + metadata: + name: versions-treasuremap + $patch: delete diff --git a/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml b/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml index f8af103d2..be71de4c6 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml @@ -27,3 +27,9 @@ patches: |- metadata: name: versions-airshipctl $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VersionsCatalogue + metadata: + name: versions-treasuremap + $patch: delete diff --git a/manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml index 561cbc571..eb9e7e9b5 100644 --- a/manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml +++ b/manifests/site/virtual-network-cloud/target/workers/hostgenerator/patch-delete-catalogues.yaml @@ -29,7 +29,13 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: VersionsCatalogue metadata: name: versions-airshipctl $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VersionsCatalogue + metadata: + name: versions-treasuremap + $patch: delete diff --git a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml index bf8114060..f243c2aae 100644 --- a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml @@ -1,2 +1,5 @@ resources: - - ../../../../type/airship-core/target/workload + - ../../../../type/multi-tenant/target/workload + - ../catalogues +transformers: + - ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements diff --git a/manifests/type/airship-core/shared/catalogues/kustomization.yaml b/manifests/type/airship-core/shared/catalogues/kustomization.yaml index b521302a3..72a356a1f 100644 --- a/manifests/type/airship-core/shared/catalogues/kustomization.yaml +++ b/manifests/type/airship-core/shared/catalogues/kustomization.yaml @@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../../../airshipctl/manifests/function/airshipctl-base-catalogues + - ../../../../function/treasuremap-base-catalogues patchesStrategicMerge: - networking.yaml # Uncomment to patch versions catalogue once needed diff --git a/manifests/type/airship-core/target/workload/kustomization.yaml b/manifests/type/airship-core/target/workload/kustomization.yaml index 5e84d10fd..6b52294c8 100644 --- a/manifests/type/airship-core/target/workload/kustomization.yaml +++ b/manifests/type/airship-core/target/workload/kustomization.yaml @@ -1,6 +1,2 @@ resources: - - ../../../../../../airshipctl/manifests/function/airshipctl-base-catalogues - ../../../../../../airshipctl/manifests/type/gating/target/workload - -transformers: - - ../../../../../../airshipctl/manifests/type/gating/target/workload/ingress/replacements diff --git a/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml b/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml index e05513347..74b8707df 100644 --- a/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml +++ b/manifests/type/multi-tenant/shared/catalogues/kustomization.yaml @@ -9,4 +9,3 @@ resources: # Uncomment to patch versions catalogue once needed # patchesStrategicMerge: # - versions.yaml -