From ce5ca13b618f15ac9e076c1c28fb426cc4a52410 Mon Sep 17 00:00:00 2001 From: Matt McEuen Date: Tue, 11 May 2021 11:11:20 -0500 Subject: [PATCH] Add `replacements/` for the flux composite The flux composite bundles together the two individual flux operator functions, but it fails to provide a `replacements/` to bundle together their replacements. This results in sites in airshipctl and treasuremap needing to pull in the function replacementes individually at the site level, negating the benefit of the composite abstraction. This adds the replacements kustomization and adjusts test-site to use it. Change-Id: Ib08e24bdd6ec8222363137bd09ad79dbcd804490 --- .../composite/flux-helm/replacements/kustomization.yaml | 5 +++++ manifests/site/test-site/target/initinfra/kustomization.yaml | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 manifests/composite/flux-helm/replacements/kustomization.yaml diff --git a/manifests/composite/flux-helm/replacements/kustomization.yaml b/manifests/composite/flux-helm/replacements/kustomization.yaml new file mode 100644 index 000000000..8d6da389c --- /dev/null +++ b/manifests/composite/flux-helm/replacements/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../../function/flux/source-controller/replacements + - ../../../function/flux/helm-controller/replacements diff --git a/manifests/site/test-site/target/initinfra/kustomization.yaml b/manifests/site/test-site/target/initinfra/kustomization.yaml index ea51727d1..eee5654b8 100644 --- a/manifests/site/test-site/target/initinfra/kustomization.yaml +++ b/manifests/site/test-site/target/initinfra/kustomization.yaml @@ -10,5 +10,4 @@ commonLabels: transformers: - ../../../../function/baremetal-operator/replacements - - ../../../../function/flux/source-controller/replacements - - ../../../../function/flux/helm-controller/replacements + - ../../../../composite/flux-helm/replacements