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 deleted file mode 100644 index 561cbc571..000000000 --- a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml +++ /dev/null @@ -1,35 +0,0 @@ -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/catalogues/cleanup/smp.yaml b/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml index 5b96bd725..f8af103d2 100644 --- a/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml +++ b/manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml @@ -11,7 +11,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: NetworkCatalogue metadata: name: networking $patch: delete @@ -23,7 +23,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: VersionsCatalogue metadata: name: versions-airshipctl $patch: delete diff --git a/manifests/site/test-site/ephemeral/catalogues/networking.yaml b/manifests/site/test-site/ephemeral/catalogues/networking.yaml index 8f82433d5..c45f0a20a 100644 --- a/manifests/site/test-site/ephemeral/catalogues/networking.yaml +++ b/manifests/site/test-site/ephemeral/catalogues/networking.yaml @@ -2,18 +2,19 @@ # ephemeral cluster, on top of the target cluster networking definition. # These values can be overridden at the site, type, etc levels as appropriate. apiVersion: airshipit.org/v1alpha1 -kind: VariableCatalogue +kind: NetworkCatalogue metadata: name: networking -# The catalogue should be overridden as appropriate for different kubernetes -# clusters, e.g. ephemeral vs target vs tenant -kubernetes: - podCidr: "192.168.0.0/24" - controlPlaneEndpoint: - host: "10.23.25.101" - apiserverCertSANs: "[10.23.25.101, 10.23.24.101]" - -ironic: - provisioningIp: "10.23.24.101" - dhcpRange: "10.23.24.200,10.23.24.250" +spec: + # The catalogue should be overridden as appropriate for different kubernetes + # clusters, e.g. ephemeral vs target vs tenant + kubernetes: + podCidr: "192.168.0.0/24" + controlPlaneEndpoint: + host: "10.23.25.101" + apiserverCertSANs: "[10.23.25.101, 10.23.24.101]" + + ironic: + provisioningIp: "10.23.24.101" + dhcpRange: "10.23.24.200,10.23.24.250" 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 deleted file mode 100644 index 561cbc571..000000000 --- a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml +++ /dev/null @@ -1,35 +0,0 @@ -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/host-inventory/hostgenerator/patchesstrategicmerge.yaml b/manifests/site/test-site/host-inventory/hostgenerator/patchesstrategicmerge.yaml deleted file mode 100644 index 561cbc571..000000000 --- a/manifests/site/test-site/host-inventory/hostgenerator/patchesstrategicmerge.yaml +++ /dev/null @@ -1,35 +0,0 @@ -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/catalogues/cleanup/smp.yaml b/manifests/site/test-site/target/catalogues/cleanup/smp.yaml index 5b96bd725..f8af103d2 100644 --- a/manifests/site/test-site/target/catalogues/cleanup/smp.yaml +++ b/manifests/site/test-site/target/catalogues/cleanup/smp.yaml @@ -11,7 +11,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: NetworkCatalogue metadata: name: networking $patch: delete @@ -23,7 +23,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: VersionsCatalogue metadata: name: versions-airshipctl $patch: delete diff --git a/manifests/site/test-site/target/catalogues/networking.yaml b/manifests/site/test-site/target/catalogues/networking.yaml index 83795898a..dc4dd4641 100644 --- a/manifests/site/test-site/target/catalogues/networking.yaml +++ b/manifests/site/test-site/target/catalogues/networking.yaml @@ -2,18 +2,19 @@ # ephemeral cluster, on top of the target cluster networking definition. # These values can be overridden at the site, type, etc levels as appropriate. apiVersion: airshipit.org/v1alpha1 -kind: VariableCatalogue +kind: NetworkCatalogue metadata: name: networking -# The catalogue should be overridden as appropriate for different kubernetes -# clusters, e.g. ephemeral vs target vs tenant -kubernetes: - controlPlaneEndpoint: - host: "10.23.25.102" - apiserverCertSANs: "[10.23.25.102, 10.23.24.102]" - -ironic: - provisioningIp: "10.23.24.102" - dhcpRange: "10.23.24.200,10.23.24.250" +spec: + # The catalogue should be overridden as appropriate for different kubernetes + # clusters, e.g. ephemeral vs target vs tenant + kubernetes: + controlPlaneEndpoint: + host: "10.23.25.102" + apiserverCertSANs: "[10.23.25.102, 10.23.24.102]" + + ironic: + provisioningIp: "10.23.24.102" + dhcpRange: "10.23.24.200,10.23.24.250" diff --git a/manifests/site/test-site/target/catalogues/versions-airshipctl.yaml b/manifests/site/test-site/target/catalogues/versions-airshipctl.yaml index 1d7abbd65..be4a57f95 100644 --- a/manifests/site/test-site/target/catalogues/versions-airshipctl.yaml +++ b/manifests/site/test-site/target/catalogues/versions-airshipctl.yaml @@ -1,12 +1,13 @@ # Override default controlplane image location apiVersion: airshipit.org/v1alpha1 -kind: VariableCatalogue +kind: VersionsCatalogue metadata: name: versions-airshipctl -files: - k8scontrol: - # Host the image in a locally served location for CI - cluster_controlplane_image: - url: http://10.23.24.101:80/images/control-plane.qcow2 - checksum: http://10.23.24.101:80/images/control-plane.qcow2.md5sum +spec: + files: + k8scontrol: + # Host the image in a locally served location for CI + cluster_controlplane_image: + url: http://10.23.24.101:80/images/control-plane.qcow2 + checksum: http://10.23.24.101:80/images/control-plane.qcow2.md5sum 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 deleted file mode 100644 index 561cbc571..000000000 --- a/manifests/site/test-site/target/workers/hostgenerator/patch-delete-catalogues.yaml +++ /dev/null @@ -1,35 +0,0 @@ -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/patch-delete-catalogues.yaml b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml index 561cbc571..cf207361f 100644 --- 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 @@ -17,7 +17,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: NetworkCatalogue metadata: name: networking $patch: delete @@ -29,7 +29,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: VersionsCatalogue metadata: name: versions-airshipctl $patch: delete diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml b/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml index 5b96bd725..f8af103d2 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml @@ -11,7 +11,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: NetworkCatalogue metadata: name: networking $patch: delete @@ -23,7 +23,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: VersionsCatalogue 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 448134876..d810fd5ac 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml @@ -2,19 +2,20 @@ # ephemeral cluster, on top of the target cluster networking definition. # These values can be overridden at the site, type, etc levels as appropriate. apiVersion: airshipit.org/v1alpha1 -kind: VariableCatalogue +kind: NetworkCatalogue metadata: name: networking -# The catalogue should be overridden as appropriate for different kubernetes -# clusters, e.g. ephemeral vs target vs tenant -kubernetes: - podCidr: "192.168.0.0/24" - controlPlaneEndpoint: - host: "10.23.25.101" - apiserverCertSANs: "[10.23.25.101, 10.23.24.101]" - -ironic: - provisioningIp: "10.23.24.101" - dhcpRange: "10.23.24.200,10.23.24.250" +spec: + # The catalogue should be overridden as appropriate for different kubernetes + # clusters, e.g. ephemeral vs target vs tenant + kubernetes: + podCidr: "192.168.0.0/24" + controlPlaneEndpoint: + host: "10.23.25.101" + apiserverCertSANs: "[10.23.25.101, 10.23.24.101]" + + ironic: + provisioningIp: "10.23.24.101" + dhcpRange: "10.23.24.200,10.23.24.250" 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 index 561cbc571..cf207361f 100644 --- 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 @@ -17,7 +17,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: NetworkCatalogue metadata: name: networking $patch: delete @@ -29,7 +29,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: VersionsCatalogue metadata: name: versions-airshipctl $patch: delete diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/versions-catalogue-patch.yaml b/manifests/site/virtual-network-cloud/ephemeral/controlplane/versions-catalogue-patch.yaml index 6794e12bf..87a9e7588 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/controlplane/versions-catalogue-patch.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/controlplane/versions-catalogue-patch.yaml @@ -1,11 +1,13 @@ # Patch the versions catalogue to use the site-specific local image URL # TODO: patch this in from a site-networking catalogue in the future apiVersion: airshipit.org/v1alpha1 -kind: VariableCatalogue +kind: VersionsCatalogue metadata: name: versions-airshipctl -files: - k8scontrol: - cluster_controlplane_image: - url: http://10.23.24.1:8099/target-image.qcow2 - checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum + +spec: + files: + k8scontrol: + cluster_controlplane_image: + url: http://10.23.24.1:8099/target-image.qcow2 + checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum diff --git a/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml b/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml index 5b96bd725..f8af103d2 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml @@ -11,7 +11,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: NetworkCatalogue metadata: name: networking $patch: delete @@ -23,7 +23,7 @@ patches: |- $patch: delete --- apiVersion: airshipit.org/v1alpha1 - kind: VariableCatalogue + kind: VersionsCatalogue 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 83795898a..dc4dd4641 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml @@ -2,18 +2,19 @@ # ephemeral cluster, on top of the target cluster networking definition. # These values can be overridden at the site, type, etc levels as appropriate. apiVersion: airshipit.org/v1alpha1 -kind: VariableCatalogue +kind: NetworkCatalogue metadata: name: networking -# The catalogue should be overridden as appropriate for different kubernetes -# clusters, e.g. ephemeral vs target vs tenant -kubernetes: - controlPlaneEndpoint: - host: "10.23.25.102" - apiserverCertSANs: "[10.23.25.102, 10.23.24.102]" - -ironic: - provisioningIp: "10.23.24.102" - dhcpRange: "10.23.24.200,10.23.24.250" +spec: + # The catalogue should be overridden as appropriate for different kubernetes + # clusters, e.g. ephemeral vs target vs tenant + kubernetes: + controlPlaneEndpoint: + host: "10.23.25.102" + apiserverCertSANs: "[10.23.25.102, 10.23.24.102]" + + ironic: + provisioningIp: "10.23.24.102" + dhcpRange: "10.23.24.200,10.23.24.250" diff --git a/manifests/site/virtual-network-cloud/target/catalogues/versions-airshipctl.yaml b/manifests/site/virtual-network-cloud/target/catalogues/versions-airshipctl.yaml index d41f3c55f..25575d25e 100644 --- a/manifests/site/virtual-network-cloud/target/catalogues/versions-airshipctl.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/versions-airshipctl.yaml @@ -1,12 +1,13 @@ # Override default controlplane image location apiVersion: airshipit.org/v1alpha1 -kind: VariableCatalogue +kind: VersionsCatalogue metadata: name: versions-airshipctl -files: - k8scontrol: - # Host the image in a locally served location for CI - cluster_controlplane_image: - url: http://10.23.24.1:8099/target-image.qcow2 - checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum +spec: + files: + k8scontrol: + # Host the image in a locally served location for CI + cluster_controlplane_image: + url: http://10.23.24.1:8099/target-image.qcow2 + checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum diff --git a/manifests/type/airship-core/shared/catalogues/networking.yaml b/manifests/type/airship-core/shared/catalogues/networking.yaml index 7af9d3015..2bf0274a7 100644 --- a/manifests/type/airship-core/shared/catalogues/networking.yaml +++ b/manifests/type/airship-core/shared/catalogues/networking.yaml @@ -1,45 +1,45 @@ # The default networking catalogue for functions hosted in the airshipctl project. # These values can be overridden at the site, type, etc levels as appropriate. apiVersion: airshipit.org/v1alpha1 -kind: VariableCatalogue +kind: NetworkCatalogue metadata: labels: airshipit.org/deploy-k8s: "false" name: networking - -# This section is only relevant when using Metal3 BareMetalHosts, and -# is consumed by the `hostgenerator-m3` function. -# It defines host-level networking that is common across all BMHs in a site, -# and will typically be fully overridden at the Type and Site level. -commonHostNetworking: - links: - - id: oam - name: oam - type: phy - mtu: "1500" - # ethernet_mac_address: (optional) - - id: pxe - name: pxe - type: phy - mtu: "1500" - # ethernet_mac_address: (optional) - networks: - - id: oam-ipv4 - type: ipv4 - link: oam - # ip_address: - netmask: 255.255.255.0 - routes: - - network: 0.0.0.0 - netmask: 0.0.0.0 - gateway: 10.23.25.1 - - id: pxe-ipv4 - type: ipv4 - link: pxe - # ip_address: - netmask: 255.255.255.0 - services: - - address: 8.8.8.8 - type: dns - - address: 8.8.4.4 - type: dns +spec: + # This section is only relevant when using Metal3 BareMetalHosts, and + # is consumed by the `hostgenerator-m3` function. + # It defines host-level networking that is common across all BMHs in a site, + # and will typically be fully overridden at the Type and Site level. + commonHostNetworking: + links: + - id: oam + name: oam + type: phy + mtu: "1500" + # ethernet_mac_address: (optional) + - id: pxe + name: pxe + type: phy + mtu: "1500" + # ethernet_mac_address: (optional) + networks: + - id: oam-ipv4 + type: ipv4 + link: oam + # ip_address: + netmask: 255.255.255.0 + routes: + - network: 0.0.0.0 + netmask: 0.0.0.0 + gateway: 10.23.25.1 + - id: pxe-ipv4 + type: ipv4 + link: pxe + # ip_address: + netmask: 255.255.255.0 + services: + - address: 8.8.8.8 + type: dns + - address: 8.8.4.4 + type: dns diff --git a/playbooks/airship-treasuremap-gate-runner.yaml b/playbooks/airship-treasuremap-gate-runner.yaml index 4c89d27d6..5351ed13d 100644 --- a/playbooks/airship-treasuremap-gate-runner.yaml +++ b/playbooks/airship-treasuremap-gate-runner.yaml @@ -16,7 +16,7 @@ environment: SOPS_IMPORT_PGP: "{{ airship_config_pgp }}" SOPS_PGP_FP: "{{ airship_config_pgp_fp }}" - AIRSHIPCTL_REF: "681f8547c989e862d155f2e9f2c794c89326d931" + AIRSHIPCTL_REF: "5820e22d9f436df2f93d8b71286b2ad0492279bc" tasks: - name: "set default gate scripts" set_fact: