From b8c0fecbed37f283966ed44044006bee3acd1a45 Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Tue, 25 May 2021 21:02:13 +0000 Subject: [PATCH] Fix workload replacements The workload entrypoint does not have an replacements directory, meaning that each function's replacements must be listed at the site level. Relying on calling a function's replacements can be unreliable when making changes at the type level because entrypoints also have to be updated at the site level. This change adds a replacements entrypoint for the workload phases so that changes can be made at the type level without changing each site. Signed-off-by: Drew Walters Change-Id: I450fb5e57967b1fe0b585f85686b558962338d90 --- .../target/workload/kustomization.yaml | 2 +- .../target/workload/kustomization.yaml | 5 +---- .../target/workload/kustomization.yaml | 5 +---- .../target/workload/replacements/kustomization.yaml | 3 ++- .../target/workload/replacements/kustomization.yaml | 6 +++++- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/manifests/site/reference-airship-core/target/workload/kustomization.yaml b/manifests/site/reference-airship-core/target/workload/kustomization.yaml index 027e4f703..ceebdf783 100644 --- a/manifests/site/reference-airship-core/target/workload/kustomization.yaml +++ b/manifests/site/reference-airship-core/target/workload/kustomization.yaml @@ -2,4 +2,4 @@ resources: - ../../../../type/airship-core/target/workload - ../catalogues transformers: - - ../../../../function/ingress/replacements + - ../../../../type/airship-core/target/workload/replacements diff --git a/manifests/site/reference-multi-tenant/target/workload/kustomization.yaml b/manifests/site/reference-multi-tenant/target/workload/kustomization.yaml index ed3e2b79c..f89cdf4db 100644 --- a/manifests/site/reference-multi-tenant/target/workload/kustomization.yaml +++ b/manifests/site/reference-multi-tenant/target/workload/kustomization.yaml @@ -2,7 +2,4 @@ resources: - ../../../../type/multi-tenant/target/workload - ../catalogues transformers: - - ../../../../function/ingress/replacements - - ../../../../function/sip/replacements - - ../../../../function/synclabeller/replacements - - ../../../../function/vino/replacements + - ../../../../type/multi-tenant/target/workload/replacements diff --git a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml index ed3e2b79c..f89cdf4db 100644 --- a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml @@ -2,7 +2,4 @@ resources: - ../../../../type/multi-tenant/target/workload - ../catalogues transformers: - - ../../../../function/ingress/replacements - - ../../../../function/sip/replacements - - ../../../../function/synclabeller/replacements - - ../../../../function/vino/replacements + - ../../../../type/multi-tenant/target/workload/replacements diff --git a/manifests/type/airship-core/target/workload/replacements/kustomization.yaml b/manifests/type/airship-core/target/workload/replacements/kustomization.yaml index 36cffc6d8..a72f4ca90 100644 --- a/manifests/type/airship-core/target/workload/replacements/kustomization.yaml +++ b/manifests/type/airship-core/target/workload/replacements/kustomization.yaml @@ -1,2 +1,3 @@ resources: -- ../../../../../composite/storage-cluster/replacements + - ../../../../../composite/storage-cluster/replacements + - ../../../../../function/ingress/replacements diff --git a/manifests/type/multi-tenant/target/workload/replacements/kustomization.yaml b/manifests/type/multi-tenant/target/workload/replacements/kustomization.yaml index 36cffc6d8..cd95cb7c4 100644 --- a/manifests/type/multi-tenant/target/workload/replacements/kustomization.yaml +++ b/manifests/type/multi-tenant/target/workload/replacements/kustomization.yaml @@ -1,2 +1,6 @@ resources: -- ../../../../../composite/storage-cluster/replacements + - ../../../../../composite/storage-cluster/replacements + - ../../../../../function/ingress/replacements + - ../../../../../function/sip/replacements + - ../../../../../function/synclabeller/replacements + - ../../../../../function/vino/replacements