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
This commit is contained in:
parent
d9206c2121
commit
d5ec4ecbd2
@ -1,5 +1,8 @@
|
|||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
kind: Kustomization
|
kind: Kustomization
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
- versions-airshipctl.yaml
|
- versions-airshipctl.yaml
|
||||||
|
|
||||||
|
generators:
|
||||||
- env-vars-template.yaml
|
- env-vars-template.yaml
|
||||||
|
@ -6,7 +6,6 @@ resources:
|
|||||||
|
|
||||||
generators:
|
generators:
|
||||||
- hostgenerator
|
- hostgenerator
|
||||||
- ../../../../function/airshipctl-catalogues
|
|
||||||
|
|
||||||
patchesStrategicMerge:
|
patchesStrategicMerge:
|
||||||
- baremetalhost.yaml
|
- baremetalhost.yaml
|
||||||
|
@ -10,8 +10,5 @@ resources:
|
|||||||
patchesStrategicMerge:
|
patchesStrategicMerge:
|
||||||
- versions-catalogue-patch.yaml
|
- versions-catalogue-patch.yaml
|
||||||
|
|
||||||
generators:
|
|
||||||
- ../../../../function/airshipctl-catalogues
|
|
||||||
|
|
||||||
transformers:
|
transformers:
|
||||||
- ../../../../function/k8scontrol/replacements
|
- ../../../../function/k8scontrol/replacements
|
||||||
|
@ -10,9 +10,6 @@ patchesStrategicMerge:
|
|||||||
commonLabels:
|
commonLabels:
|
||||||
airshipit.org/stage: initinfra
|
airshipit.org/stage: initinfra
|
||||||
|
|
||||||
generators:
|
|
||||||
- ../../../../function/airshipctl-catalogues
|
|
||||||
|
|
||||||
transformers:
|
transformers:
|
||||||
- ../../../../composite/infra/replacements
|
- ../../../../composite/infra/replacements
|
||||||
- ../../../../function/baremetal-operator/replacements
|
- ../../../../function/baremetal-operator/replacements
|
||||||
|
@ -4,6 +4,7 @@ resources:
|
|||||||
# TODO (dukov) It's recocommended to upload BareMetalHost objects separately
|
# TODO (dukov) It's recocommended to upload BareMetalHost objects separately
|
||||||
# otherwise nodes will hang in 'registering' state for quite a long time
|
# otherwise nodes will hang in 'registering' state for quite a long time
|
||||||
- nodes
|
- nodes
|
||||||
|
- ../../../../function/airshipctl-catalogues
|
||||||
- ../../../../function/k8scontrol
|
- ../../../../function/k8scontrol
|
||||||
|
|
||||||
patchesStrategicMerge:
|
patchesStrategicMerge:
|
||||||
@ -11,6 +12,3 @@ patchesStrategicMerge:
|
|||||||
|
|
||||||
commonLabels:
|
commonLabels:
|
||||||
airshipit.org/stage: initinfra
|
airshipit.org/stage: initinfra
|
||||||
|
|
||||||
generators:
|
|
||||||
- ../../../../function/airshipctl-catalogues
|
|
||||||
|
@ -11,9 +11,6 @@ patchesStrategicMerge:
|
|||||||
commonLabels:
|
commonLabels:
|
||||||
airshipit.org/stage: initinfra
|
airshipit.org/stage: initinfra
|
||||||
|
|
||||||
generators:
|
|
||||||
- ../../../../function/airshipctl-catalogues
|
|
||||||
|
|
||||||
transformers:
|
transformers:
|
||||||
- ../../../../composite/infra/replacements
|
- ../../../../composite/infra/replacements
|
||||||
- ../../../../function/baremetal-operator/replacements
|
- ../../../../function/baremetal-operator/replacements
|
||||||
|
Loading…
x
Reference in New Issue
Block a user