diff --git a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml index 5acc9b591..1bc039536 100644 --- a/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml +++ b/manifests/site/test-site/ephemeral/bootstrap/hostgenerator/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3 - - ../../../shared/catalogues/ + - ../../catalogues/ - host-generation.yaml transformers: diff --git a/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml b/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml index f83d758d8..e20954834 100644 --- a/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml +++ b/manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml @@ -2,9 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../type/airship-core/ephemeral/bootstrap + - ../catalogues generators: - hostgenerator patchesStrategicMerge: - baremetalhost.yaml + +transformers: + - ../../../../type/airship-core/ephemeral/bootstrap/replacements diff --git a/manifests/site/test-site/ephemeral/catalogues/README.md b/manifests/site/test-site/ephemeral/catalogues/README.md new file mode 100755 index 000000000..edfffd775 --- /dev/null +++ b/manifests/site/test-site/ephemeral/catalogues/README.md @@ -0,0 +1,4 @@ +# Catalogue Definitions for Target Cluster + +This inherits Site-level catalogues from the neighboring target cluster's +`catalogues` kustomization, and tweaks a few values for the ephemeral cluster. diff --git a/manifests/site/test-site/ephemeral/catalogues/kustomization.yaml b/manifests/site/test-site/ephemeral/catalogues/kustomization.yaml new file mode 100644 index 000000000..5f99dd8a4 --- /dev/null +++ b/manifests/site/test-site/ephemeral/catalogues/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../target/catalogues +patchesStrategicMerge: + - networking.yaml diff --git a/manifests/site/test-site/ephemeral/catalogues/networking.yaml b/manifests/site/test-site/ephemeral/catalogues/networking.yaml new file mode 100644 index 000000000..8f82433d5 --- /dev/null +++ b/manifests/site/test-site/ephemeral/catalogues/networking.yaml @@ -0,0 +1,19 @@ +# This makes a couple small networking tweaks that are specific to the +# 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 +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" diff --git a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml b/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml index 5acc9b591..1bc039536 100644 --- a/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml +++ b/manifests/site/test-site/ephemeral/controlplane/hostgenerator/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3 - - ../../../shared/catalogues/ + - ../../catalogues/ - host-generation.yaml transformers: diff --git a/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml b/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml index a66b87083..5f0c1fda5 100644 --- a/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml +++ b/manifests/site/test-site/ephemeral/controlplane/kustomization.yaml @@ -2,11 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../type/airship-core/ephemeral/controlplane - - ../../shared/catalogues + - ../catalogues # TODO (dukov) It's recocommended to upload BareMetalHost objects separately # otherwise nodes will hang in 'registering' state for quite a long time - nodes -patchesStrategicMerge: - - versions-catalogue-patch.yaml transformers: - - ../../../../type/airship-core/ephemeral/controlplane/replacements \ No newline at end of file + - ../../../../type/airship-core/ephemeral/controlplane/replacements diff --git a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml b/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml index 6473f75f2..5ed5d63ac 100644 --- a/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml +++ b/manifests/site/test-site/ephemeral/initinfra/kustomization.yaml @@ -1,7 +1,5 @@ resources: - ../../../../type/airship-core/ephemeral/initinfra - - ../../shared/catalogues -patchesStrategicMerge: - - patch_bmo_config.yaml + - ../catalogues transformers: - - ../../../../type/airship-core/ephemeral/initinfra/replacements \ No newline at end of file + - ../../../../type/airship-core/ephemeral/initinfra/replacements diff --git a/manifests/site/test-site/ephemeral/initinfra/patch_bmo_config.yaml b/manifests/site/test-site/ephemeral/initinfra/patch_bmo_config.yaml deleted file mode 100644 index cc0f7bb2a..000000000 --- a/manifests/site/test-site/ephemeral/initinfra/patch_bmo_config.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: ironic-vars -data: - PROVISIONING_IP: "10.23.24.101" - DHCP_RANGE: "10.23.24.200,10.23.24.250" diff --git a/manifests/site/test-site/target/catalogues/README.md b/manifests/site/test-site/target/catalogues/README.md new file mode 100755 index 000000000..2cf4557b1 --- /dev/null +++ b/manifests/site/test-site/target/catalogues/README.md @@ -0,0 +1,5 @@ +# Catalogue Definitions for Target Cluster + +This inherits Type-level catalogues, and adds in Site-specific values. +The neighboring ephemeral cluster's `catalogues` entrypoint applies further +customizations on top of this for ephemeral use. diff --git a/manifests/site/virtual-network-cloud/shared/catalogues/hosts.yaml b/manifests/site/test-site/target/catalogues/hosts.yaml similarity index 59% rename from manifests/site/virtual-network-cloud/shared/catalogues/hosts.yaml rename to manifests/site/test-site/target/catalogues/hosts.yaml index 858c607e5..abbf90e45 100644 --- a/manifests/site/virtual-network-cloud/shared/catalogues/hosts.yaml +++ b/manifests/site/test-site/target/catalogues/hosts.yaml @@ -3,12 +3,14 @@ apiVersion: airshipit.org/v1alpha1 kind: VariableCatalogue metadata: + name: host-catalogue labels: airshipit.org/deploy-k8s: "false" - name: host-catalogue + hosts: m3: node01: + bootMode: UEFI macAddress: 52:54:00:b6:ed:31 bmcAddress: redfish+http://10.23.25.1:8000/redfish/v1/Systems/air-target-1 bmcUsername: root @@ -19,9 +21,9 @@ hosts: macAddresses: oam: 52:54:00:9b:27:4c pxe: 52:54:00:b6:ed:31 - bootMode: legacy - hardwareProfile: default # defined in the hostgenerator-m3 function + hardwareProfile: default # defined in the hostgenerator-m3 function node02: + bootMode: UEFI macAddress: 52:54:00:b6:ed:02 bmcAddress: redfish+http://10.23.25.2:8000/redfish/v1/Systems/air-target-2 bmcUsername: username @@ -32,4 +34,17 @@ hosts: macAddresses: oam: 52:54:00:9b:27:02 pxe: 52:54:00:b6:ed:02 - hardwareProfile: default # defined in the hostgenerator-m3 function + hardwareProfile: example # defined in the hardwareprofile-example function + node03: + bootMode: UEFI + macAddress: 52:54:00:b6:ed:23 + bmcAddress: redfish+http://10.23.25.1:8000/redfish/v1/Systems/air-worker-1 + bmcUsername: username + bmcPassword: password + ipAddresses: + oam-ipv4: 10.23.25.103 + pxe-ipv4: 10.23.24.103 + macAddresses: + oam: 52:54:00:9b:27:07 + pxe: 52:54:00:b6:ed:23 + hardwareProfile: default # defined in the hardwareprofile-example function diff --git a/manifests/site/test-site/shared/catalogues/kustomization.yaml b/manifests/site/test-site/target/catalogues/kustomization.yaml similarity index 65% rename from manifests/site/test-site/shared/catalogues/kustomization.yaml rename to manifests/site/test-site/target/catalogues/kustomization.yaml index c3f71aada..c2eedecd0 100644 --- a/manifests/site/test-site/shared/catalogues/kustomization.yaml +++ b/manifests/site/test-site/target/catalogues/kustomization.yaml @@ -1,5 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../../../type/airship-core/shared/catalogues - hosts.yaml + +patchesStrategicMerge: + - versions-airshipctl.yaml + - networking.yaml diff --git a/manifests/site/test-site/target/catalogues/networking.yaml b/manifests/site/test-site/target/catalogues/networking.yaml new file mode 100644 index 000000000..83795898a --- /dev/null +++ b/manifests/site/test-site/target/catalogues/networking.yaml @@ -0,0 +1,19 @@ +# This makes a couple small networking tweaks that are specific to the +# 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 +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" + diff --git a/manifests/site/test-site/ephemeral/controlplane/versions-catalogue-patch.yaml b/manifests/site/test-site/target/catalogues/versions-airshipctl.yaml similarity index 65% rename from manifests/site/test-site/ephemeral/controlplane/versions-catalogue-patch.yaml rename to manifests/site/test-site/target/catalogues/versions-airshipctl.yaml index 6794e12bf..d41f3c55f 100644 --- a/manifests/site/test-site/ephemeral/controlplane/versions-catalogue-patch.yaml +++ b/manifests/site/test-site/target/catalogues/versions-airshipctl.yaml @@ -1,11 +1,12 @@ -# Patch the versions catalogue to use the site-specific local image URL -# TODO: patch this in from a site-networking catalogue in the future +# Override default controlplane image location apiVersion: airshipit.org/v1alpha1 kind: VariableCatalogue 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 diff --git a/manifests/site/test-site/target/initinfra/kustomization.yaml b/manifests/site/test-site/target/initinfra/kustomization.yaml index 8e2776b56..b652333d3 100644 --- a/manifests/site/test-site/target/initinfra/kustomization.yaml +++ b/manifests/site/test-site/target/initinfra/kustomization.yaml @@ -1,8 +1,6 @@ resources: - ../../../../type/airship-core/target/initinfra - - ../../shared/catalogues - ../../../../function/hostconfig-operator -patchesStrategicMerge: - - patch_bmo_config.yaml + - ../catalogues transformers: - ../../../../type/airship-core/target/initinfra/replacements diff --git a/manifests/site/test-site/target/initinfra/patch_bmo_config.yaml b/manifests/site/test-site/target/initinfra/patch_bmo_config.yaml deleted file mode 100644 index f9033074f..000000000 --- a/manifests/site/test-site/target/initinfra/patch_bmo_config.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: ironic-vars -data: - PROVISIONING_IP: "10.23.25.102" - DHCP_RANGE: "10.23.25.200,10.23.25.250" diff --git a/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml b/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml index 5acc9b591..1bc039536 100644 --- a/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml +++ b/manifests/site/test-site/target/workers/hostgenerator/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3 - - ../../../shared/catalogues/ + - ../../catalogues/ - host-generation.yaml transformers: 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 5acc9b591..1bc039536 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3 - - ../../../shared/catalogues/ + - ../../catalogues/ - host-generation.yaml transformers: diff --git a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml index 7ecccf013..14b01c394 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/bootstrap/kustomization.yaml @@ -2,9 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../type/network-cloud/ephemeral/bootstrap + - ../catalogues generators: - hostgenerator patchesStrategicMerge: - baremetalhost.yaml + +transformers: + - ../../../../type/network-cloud/ephemeral/bootstrap/replacements diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/README.md b/manifests/site/virtual-network-cloud/ephemeral/catalogues/README.md new file mode 100755 index 000000000..edfffd775 --- /dev/null +++ b/manifests/site/virtual-network-cloud/ephemeral/catalogues/README.md @@ -0,0 +1,4 @@ +# Catalogue Definitions for Target Cluster + +This inherits Site-level catalogues from the neighboring target cluster's +`catalogues` kustomization, and tweaks a few values for the ephemeral cluster. diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/catalogues/kustomization.yaml new file mode 100644 index 000000000..5f99dd8a4 --- /dev/null +++ b/manifests/site/virtual-network-cloud/ephemeral/catalogues/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../target/catalogues +patchesStrategicMerge: + - networking.yaml diff --git a/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml b/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml new file mode 100644 index 000000000..2081a341b --- /dev/null +++ b/manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml @@ -0,0 +1,20 @@ +# This makes a couple small networking tweaks that are specific to the +# 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 +metadata: + name: networking-catalogue + +# 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/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml index 5acc9b591..1bc039536 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../../../../airshipctl/manifests/function/hostgenerator-m3 - - ../../../shared/catalogues/ + - ../../catalogues/ - host-generation.yaml transformers: diff --git a/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml index cbdd45522..db9072633 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/controlplane/kustomization.yaml @@ -2,11 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../../../type/network-cloud/ephemeral/controlplane - - ../../shared/catalogues + - ../catalogues # TODO (dukov) It's recocommended to upload BareMetalHost objects separately # otherwise nodes will hang in 'registering' state for quite a long time - nodes -patchesStrategicMerge: - - versions-catalogue-patch.yaml transformers: - ../../../../type/network-cloud/ephemeral/controlplane/replacements diff --git a/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml b/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml index 74a74a3a2..3002826ea 100644 --- a/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/ephemeral/initinfra/kustomization.yaml @@ -1,7 +1,5 @@ resources: - ../../../../type/network-cloud/ephemeral/initinfra - - ../../shared/catalogues -patchesStrategicMerge: - - patch_bmo_config.yaml + - ../catalogues transformers: - - ../../../../type/airship-core/ephemeral/initinfra/replacements \ No newline at end of file + - ../../../../type/airship-core/ephemeral/initinfra/replacements diff --git a/manifests/site/virtual-network-cloud/ephemeral/initinfra/patch_bmo_config.yaml b/manifests/site/virtual-network-cloud/ephemeral/initinfra/patch_bmo_config.yaml deleted file mode 100644 index 807852aa8..000000000 --- a/manifests/site/virtual-network-cloud/ephemeral/initinfra/patch_bmo_config.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -kind: ConfigMap -apiVersion: v1 -metadata: - labels: - name: ironic-vars -data: - PROVISIONING_IP: "10.23.24.101" - DHCP_RANGE: "10.23.24.200,10.23.24.250" diff --git a/manifests/site/virtual-network-cloud/target/catalogues/README.md b/manifests/site/virtual-network-cloud/target/catalogues/README.md new file mode 100755 index 000000000..2cf4557b1 --- /dev/null +++ b/manifests/site/virtual-network-cloud/target/catalogues/README.md @@ -0,0 +1,5 @@ +# Catalogue Definitions for Target Cluster + +This inherits Type-level catalogues, and adds in Site-specific values. +The neighboring ephemeral cluster's `catalogues` entrypoint applies further +customizations on top of this for ephemeral use. diff --git a/manifests/site/test-site/shared/catalogues/hosts.yaml b/manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml similarity index 99% rename from manifests/site/test-site/shared/catalogues/hosts.yaml rename to manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml index e3a968a83..9ff8576e9 100644 --- a/manifests/site/test-site/shared/catalogues/hosts.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml @@ -3,9 +3,10 @@ apiVersion: airshipit.org/v1alpha1 kind: VariableCatalogue metadata: + name: host-catalogue labels: airshipit.org/deploy-k8s: "false" - name: host-catalogue + hosts: m3: node01: diff --git a/manifests/site/virtual-network-cloud/shared/catalogues/kustomization.yaml b/manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml similarity index 65% rename from manifests/site/virtual-network-cloud/shared/catalogues/kustomization.yaml rename to manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml index d2820b364..fbe5e2569 100644 --- a/manifests/site/virtual-network-cloud/shared/catalogues/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/target/catalogues/kustomization.yaml @@ -1,5 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization + resources: - ../../../../type/network-cloud/shared/catalogues - hosts.yaml + +patchesStrategicMerge: + - versions-airshipctl.yaml + - networking.yaml diff --git a/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml b/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml new file mode 100644 index 000000000..92ce68a64 --- /dev/null +++ b/manifests/site/virtual-network-cloud/target/catalogues/networking.yaml @@ -0,0 +1,19 @@ +# This makes a couple small networking tweaks that are specific to the +# 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 +metadata: + name: networking-catalogue + +# 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 new file mode 100644 index 000000000..d41f3c55f --- /dev/null +++ b/manifests/site/virtual-network-cloud/target/catalogues/versions-airshipctl.yaml @@ -0,0 +1,12 @@ +# Override default controlplane image location +apiVersion: airshipit.org/v1alpha1 +kind: VariableCatalogue +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 diff --git a/manifests/type/airship-core/ephemeral/bootstrap/replacements/kustomization.yaml b/manifests/type/airship-core/ephemeral/bootstrap/replacements/kustomization.yaml new file mode 100644 index 000000000..40443ffbf --- /dev/null +++ b/manifests/type/airship-core/ephemeral/bootstrap/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../../../../../../airshipctl/manifests/function/ephemeral/replacements diff --git a/manifests/type/airship-core/ephemeral/initinfra/replacements/kustomization.yaml b/manifests/type/airship-core/ephemeral/initinfra/replacements/kustomization.yaml index 2e09548b2..5d755393f 100644 --- a/manifests/type/airship-core/ephemeral/initinfra/replacements/kustomization.yaml +++ b/manifests/type/airship-core/ephemeral/initinfra/replacements/kustomization.yaml @@ -1,2 +1,3 @@ resources: - ../../../../../../../airshipctl/manifests/function/baremetal-operator/replacements + - ../../../../../../../airshipctl/manifests/composite/infra/replacements diff --git a/manifests/type/airship-core/shared/catalogues/kustomization.yaml b/manifests/type/airship-core/shared/catalogues/kustomization.yaml index 3da5190ef..b521302a3 100644 --- a/manifests/type/airship-core/shared/catalogues/kustomization.yaml +++ b/manifests/type/airship-core/shared/catalogues/kustomization.yaml @@ -1,8 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../../../../../airshipctl/manifests/function/airshipctl-catalogues/ - - common-networking.yaml + - ../../../../../../airshipctl/manifests/function/airshipctl-base-catalogues +patchesStrategicMerge: + - networking.yaml # Uncomment to patch versions catalogue once needed # patchesStrategicMerge: # - versions.yaml diff --git a/manifests/type/airship-core/shared/catalogues/common-networking.yaml b/manifests/type/airship-core/shared/catalogues/networking.yaml similarity index 63% rename from manifests/type/airship-core/shared/catalogues/common-networking.yaml rename to manifests/type/airship-core/shared/catalogues/networking.yaml index 68efb04bb..7af9d3015 100644 --- a/manifests/type/airship-core/shared/catalogues/common-networking.yaml +++ b/manifests/type/airship-core/shared/catalogues/networking.yaml @@ -1,12 +1,17 @@ -# Type-level networking catalogue. This info feeds the Templater -# kustomize plugin config in the hostgenerator-m3 function. +# 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 metadata: labels: airshipit.org/deploy-k8s: "false" - name: common-networking-catalogue -commonNetworking: + 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 @@ -38,4 +43,3 @@ commonNetworking: type: dns - address: 8.8.4.4 type: dns - diff --git a/manifests/type/airship-core/target/initinfra/replacements/kustomization.yaml b/manifests/type/airship-core/target/initinfra/replacements/kustomization.yaml index 2e09548b2..75d9e0e1a 100644 --- a/manifests/type/airship-core/target/initinfra/replacements/kustomization.yaml +++ b/manifests/type/airship-core/target/initinfra/replacements/kustomization.yaml @@ -1,2 +1,4 @@ resources: - ../../../../../../../airshipctl/manifests/function/baremetal-operator/replacements + - ../../../../../../../airshipctl/manifests/function/helm-operator/replacements + - ../../../../../../../airshipctl/manifests/composite/infra/replacements diff --git a/manifests/type/network-cloud/ephemeral/bootstrap/replacements/kustomization.yaml b/manifests/type/network-cloud/ephemeral/bootstrap/replacements/kustomization.yaml new file mode 100644 index 000000000..b000f599c --- /dev/null +++ b/manifests/type/network-cloud/ephemeral/bootstrap/replacements/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../../../../airship-core/ephemeral/bootstrap/replacements diff --git a/manifests/type/network-cloud/shared/catalogues/kustomization.yaml b/manifests/type/network-cloud/shared/catalogues/kustomization.yaml index 2e8caa997..e05513347 100644 --- a/manifests/type/network-cloud/shared/catalogues/kustomization.yaml +++ b/manifests/type/network-cloud/shared/catalogues/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization resources: - ../../../airship-core/shared/catalogues -# NOTE(drewwalters96): Uncomment to patch common-networking catalogue. +# NOTE(drewwalters96): Uncomment to patch networking catalogue. # patchesStrategicMerge: # - common-networking.yaml # Uncomment to patch versions catalogue once needed diff --git a/manifests/type/network-cloud/shared/catalogues/common-networking.yaml b/manifests/type/network-cloud/shared/catalogues/networking.yaml similarity index 100% rename from manifests/type/network-cloud/shared/catalogues/common-networking.yaml rename to manifests/type/network-cloud/shared/catalogues/networking.yaml