diff --git a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml index 1bc039536..a88e9926f 100644 --- a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml +++ b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml @@ -7,3 +7,4 @@ resources: transformers: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements + - patch-delete-catalogues.yaml diff --git a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml new file mode 100644 index 000000000..561cbc571 --- /dev/null +++ b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml @@ -0,0 +1,35 @@ +apiVersion: builtin +kind: PatchStrategicMergeTransformer +metadata: + name: smp +patches: |- + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-generation-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: networking + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: env-vars-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: versions-airshipctl + $patch: delete diff --git a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml b/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml index 1bc039536..a88e9926f 100644 --- a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml +++ b/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml @@ -7,3 +7,4 @@ resources: transformers: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements + - patch-delete-catalogues.yaml diff --git a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/test-site/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml new file mode 100644 index 000000000..561cbc571 --- /dev/null +++ b/manifests/site/test-site/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml @@ -0,0 +1,35 @@ +apiVersion: builtin +kind: PatchStrategicMergeTransformer +metadata: + name: smp +patches: |- + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-generation-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: networking + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: env-vars-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: versions-airshipctl + $patch: delete diff --git a/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml b/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml index 1bc039536..a88e9926f 100644 --- a/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml +++ b/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml @@ -7,3 +7,4 @@ resources: transformers: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements + - patch-delete-catalogues.yaml diff --git a/manifests/site/test-site/target/workers/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/test-site/target/workers/hostgenerator/patch-delete-catalogues.yaml new file mode 100644 index 000000000..561cbc571 --- /dev/null +++ b/manifests/site/test-site/target/workers/hostgenerator/patch-delete-catalogues.yaml @@ -0,0 +1,35 @@ +apiVersion: builtin +kind: PatchStrategicMergeTransformer +metadata: + name: smp +patches: |- + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-generation-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: networking + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: env-vars-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: versions-airshipctl + $patch: delete diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml index 1bc039536..a88e9926f 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml @@ -7,3 +7,4 @@ resources: transformers: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements + - patch-delete-catalogues.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml new file mode 100644 index 000000000..561cbc571 --- /dev/null +++ b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml @@ -0,0 +1,35 @@ +apiVersion: builtin +kind: PatchStrategicMergeTransformer +metadata: + name: smp +patches: |- + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-generation-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: networking + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: env-vars-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: versions-airshipctl + $patch: delete diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml b/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml index 2081a341b..448134876 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml @@ -4,7 +4,7 @@ apiVersion: airshipit.org/v1alpha1 kind: VariableCatalogue metadata: - name: networking-catalogue + name: networking # The catalogue should be overridden as appropriate for different kubernetes # clusters, e.g. ephemeral vs target vs tenant diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml index 1bc039536..a88e9926f 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml @@ -7,3 +7,4 @@ resources: transformers: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements + - patch-delete-catalogues.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml new file mode 100644 index 000000000..561cbc571 --- /dev/null +++ b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml @@ -0,0 +1,35 @@ +apiVersion: builtin +kind: PatchStrategicMergeTransformer +metadata: + name: smp +patches: |- + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: host-generation-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: networking + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: env-vars-catalogue + $patch: delete + --- + apiVersion: airshipit.org/v1alpha1 + kind: VariableCatalogue + metadata: + name: versions-airshipctl + $patch: delete diff --git a/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml b/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml index 92ce68a64..83795898a 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml @@ -4,7 +4,7 @@ apiVersion: airshipit.org/v1alpha1 kind: VariableCatalogue metadata: - name: networking-catalogue + name: networking # The catalogue should be overridden as appropriate for different kubernetes # clusters, e.g. ephemeral vs target vs tenant diff --git a/playbooks/get-vm-config.yaml b/playbooks/get-vm-config.yaml index 79a4d26b3..9f058acb9 100644 --- a/playbooks/get-vm-config.yaml +++ b/playbooks/get-vm-config.yaml @@ -17,12 +17,12 @@ shell: | set -e kustomize build --enable_alpha_plugins \ - {{ airship_config_manifest_directory }}/{{ airship_config_site_path }}/{{ path }} | + {{ airship_config_manifest_directory }}/{{ airship_config_site_path }}/{{ path }} 2>/dev/null | kustomize cfg grep "kind=BareMetalHost" register: bmh_command failed_when: "bmh_command.stdout == ''" environment: - KUSTOMIZE_PLUGIN_HOME: "{{ ansible_env.HOME }}/.airship/kustomize-plugins" + KUSTOMIZE_PLUGIN_HOME: "/tmp" KUSTOMIZE_ENABLE_ALPHA_COMMANDS: "true" - set_fact: @@ -32,12 +32,12 @@ shell: | set -e kustomize build --enable_alpha_plugins \ - {{ airship_config_manifest_directory }}/{{ airship_config_site_path }}/{{ path }} | + {{ airship_config_manifest_directory }}/{{ airship_config_site_path }}/{{ path }} 2>/dev/null | kustomize cfg grep "metadata.name={{ item.spec.networkData.name }}" register: netdata_command failed_when: "netdata_command.stdout == ''" environment: - KUSTOMIZE_PLUGIN_HOME: "{{ ansible_env.HOME }}/.airship/kustomize-plugins" + KUSTOMIZE_PLUGIN_HOME: "/tmp" KUSTOMIZE_ENABLE_ALPHA_COMMANDS: "true" with_items: "{{ bmh }}"