commit d5ec4ecbd2bb91a98759bc4f1a00b16fdcefe5c6
Author: Matt McEuen <madgin@madgin.net>
Date:   Wed Oct 14 17:35:16 2020 -0500

    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

diff --git a/manifests/function/airshipctl-catalogues/kustomization.yaml b/manifests/function/airshipctl-catalogues/kustomization.yaml
index e695dd8..f1b6381 100644
--- a/manifests/function/airshipctl-catalogues/kustomization.yaml
+++ b/manifests/function/airshipctl-catalogues/kustomization.yaml
@@ -1,5 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+
 resources:
   - versions-airshipctl.yaml
+
+generators:
   - env-vars-template.yaml
diff --git a/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml b/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
index 56617ff..9588129 100644
--- a/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml
@@ -6,7 +6,6 @@ resources:
 
 generators:
   - hostgenerator
-  - ../../../../function/airshipctl-catalogues
 
 patchesStrategicMerge:
   - baremetalhost.yaml
diff --git a/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml b/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
index cd2a306..df964e4 100644
--- a/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml
@@ -10,8 +10,5 @@ resources:
 patchesStrategicMerge:
   - versions-catalogue-patch.yaml
 
-generators:
-  - ../../../../function/airshipctl-catalogues
-
 transformers:
   - ../../../../function/k8scontrol/replacements
diff --git a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml b/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml
index b8a8fe8..74c22d1 100644
--- a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml
+++ b/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml
@@ -10,9 +10,6 @@ patchesStrategicMerge:
 commonLabels:
   airshipit.org/stage: initinfra
 
-generators:
-  - ../../../../function/airshipctl-catalogues
-
 transformers:
   - ../../../../composite/infra/replacements
   - ../../../../function/baremetal-operator/replacements
diff --git a/manifests/site/test-site/target/controlplane/kustomization.yaml b/manifests/site/test-site/target/controlplane/kustomization.yaml
index 60dcec7..47b9564 100644
--- a/manifests/site/test-site/target/controlplane/kustomization.yaml
+++ b/manifests/site/test-site/target/controlplane/kustomization.yaml
@@ -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
diff --git a/manifests/site/test-site/target/initinfra/kustomization.yaml b/manifests/site/test-site/target/initinfra/kustomization.yaml
index 3ede825..90e853d 100644
--- a/manifests/site/test-site/target/initinfra/kustomization.yaml
+++ b/manifests/site/test-site/target/initinfra/kustomization.yaml
@@ -11,9 +11,6 @@ patchesStrategicMerge:
 commonLabels:
   airshipit.org/stage: initinfra
 
-generators:
-  - ../../../../function/airshipctl-catalogues
-
 transformers:
   - ../../../../composite/infra/replacements
   - ../../../../function/baremetal-operator/replacements