Refactor kustomization of env vars

This tweaks the generation of the env-vars catalogue to be done in
the airshipctl-catalogues function itself, resulting in a vanilla
catalogue that can be imported as a resource across the phases that
need it.

Change-Id: I40fe9369ad2d5f4b58123f67ac90511db6a2fd12
changes/61/758261/2
Matt McEuen 2 years ago
parent d9206c2121
commit d5ec4ecbd2
  1. 3
      manifests/function/airshipctl-catalogues/kustomization.yaml
  2. 1
      manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
  3. 3
      manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
  4. 3
      manifests/site/test-site/ephemeral/initinfra/kustomization.yaml
  5. 4
      manifests/site/test-site/target/controlplane/kustomization.yaml
  6. 3
      manifests/site/test-site/target/initinfra/kustomization.yaml

@ -1,5 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- versions-airshipctl.yaml
generators:
- env-vars-template.yaml

@ -6,7 +6,6 @@ resources:
generators:
- hostgenerator
- ../../../../function/airshipctl-catalogues
patchesStrategicMerge:
- baremetalhost.yaml

@ -10,8 +10,5 @@ resources:
patchesStrategicMerge:
- versions-catalogue-patch.yaml
generators:
- ../../../../function/airshipctl-catalogues
transformers:
- ../../../../function/k8scontrol/replacements

@ -10,9 +10,6 @@ patchesStrategicMerge:
commonLabels:
airshipit.org/stage: initinfra
generators:
- ../../../../function/airshipctl-catalogues
transformers:
- ../../../../composite/infra/replacements
- ../../../../function/baremetal-operator/replacements

@ -4,6 +4,7 @@ resources:
# TODO (dukov) It's recocommended to upload BareMetalHost objects separately
# otherwise nodes will hang in 'registering' state for quite a long time
- nodes
- ../../../../function/airshipctl-catalogues
- ../../../../function/k8scontrol
patchesStrategicMerge:
@ -11,6 +12,3 @@ patchesStrategicMerge:
commonLabels:
airshipit.org/stage: initinfra
generators:
- ../../../../function/airshipctl-catalogues

@ -11,9 +11,6 @@ patchesStrategicMerge:
commonLabels:
airshipit.org/stage: initinfra
generators:
- ../../../../function/airshipctl-catalogues
transformers:
- ../../../../composite/infra/replacements
- ../../../../function/baremetal-operator/replacements

Loading…
Cancel
Save