airship/treasuremap
Code Issues Proposed changes

Aligning with NetworkCatalogue & VersionsCatalogue

Browse Source 
* Aligning with recent changes of airshipctl

  airshipctl PS:
    https://review.opendev.org/c/airship/airshipctl/+/777023
    https://review.opendev.org/c/airship/airshipctl/+/775464

* uplifting airshipctl version in treasuremap

Change-Id: I92aad33a848b2fadf63eeedf322461dbc03c68ba
This commit is contained in:
siraj.yasin
2021-03-03 00:24:45 +00:00
parent 1fdcfea301
commit 1144e50bae
19 changed files with 125 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
manifests/site/test-site/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml
View File

@@ -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

4
manifests/site/test-site/ephemeral/catalogues/cleanup/smp.yaml
View File

@@ -11,7 +11,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
$patch: delete $patch: delete
@@ -23,7 +23,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
$patch: delete $patch: delete

23
manifests/site/test-site/ephemeral/catalogues/networking.yaml
View File

@@ -2,18 +2,19 @@
# ephemeral cluster, on top of the target cluster networking definition. # ephemeral cluster, on top of the target cluster networking definition.
# These values can be overridden at the site, type, etc levels as appropriate. # These values can be overridden at the site, type, etc levels as appropriate.
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
# The catalogue should be overridden as appropriate for different kubernetes spec:
# clusters, e.g. ephemeral vs target vs tenant # The catalogue should be overridden as appropriate for different kubernetes
kubernetes: # clusters, e.g. ephemeral vs target vs tenant
podCidr: "192.168.0.0/24" kubernetes:
controlPlaneEndpoint: podCidr: "192.168.0.0/24"
host: "10.23.25.101" controlPlaneEndpoint:
apiserverCertSANs: "[10.23.25.101, 10.23.24.101]" host: "10.23.25.101"
apiserverCertSANs: "[10.23.25.101, 10.23.24.101]"
ironic: ironic:
provisioningIp: "10.23.24.101" provisioningIp: "10.23.24.101"
dhcpRange: "10.23.24.200,10.23.24.250" dhcpRange: "10.23.24.200,10.23.24.250"

35
manifests/site/test-site/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml
View File

@@ -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

35
manifests/site/test-site/host-inventory/hostgenerator/patchesstrategicmerge.yaml
View File

@@ -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

4
manifests/site/test-site/target/catalogues/cleanup/smp.yaml
View File

@@ -11,7 +11,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
$patch: delete $patch: delete
@@ -23,7 +23,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
$patch: delete $patch: delete

21
manifests/site/test-site/target/catalogues/networking.yaml
View File

@@ -2,18 +2,19 @@
# ephemeral cluster, on top of the target cluster networking definition. # ephemeral cluster, on top of the target cluster networking definition.
# These values can be overridden at the site, type, etc levels as appropriate. # These values can be overridden at the site, type, etc levels as appropriate.
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
# The catalogue should be overridden as appropriate for different kubernetes spec:
# clusters, e.g. ephemeral vs target vs tenant # The catalogue should be overridden as appropriate for different kubernetes
kubernetes: # clusters, e.g. ephemeral vs target vs tenant
controlPlaneEndpoint: kubernetes:
host: "10.23.25.102" controlPlaneEndpoint:
apiserverCertSANs: "[10.23.25.102, 10.23.24.102]" host: "10.23.25.102"
apiserverCertSANs: "[10.23.25.102, 10.23.24.102]"
ironic: ironic:
provisioningIp: "10.23.24.102" provisioningIp: "10.23.24.102"
dhcpRange: "10.23.24.200,10.23.24.250" dhcpRange: "10.23.24.200,10.23.24.250"

15
manifests/site/test-site/target/catalogues/versions-airshipctl.yaml
View File

@@ -1,12 +1,13 @@
# Override default controlplane image location # Override default controlplane image location
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
files: spec:
k8scontrol: files:
# Host the image in a locally served location for CI k8scontrol:
cluster_controlplane_image: # Host the image in a locally served location for CI
url: http://10.23.24.101:80/images/control-plane.qcow2 cluster_controlplane_image:
checksum: http://10.23.24.101:80/images/control-plane.qcow2.md5sum url: http://10.23.24.101:80/images/control-plane.qcow2
checksum: http://10.23.24.101:80/images/control-plane.qcow2.md5sum

35
manifests/site/test-site/target/workers/hostgenerator/patch-delete-catalogues.yaml
View File

@@ -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

4
manifests/site/virtual-network-cloud/ephemeral/bootstrap/hostgenerator/patch-delete-catalogues.yaml
View File

@@ -17,7 +17,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
$patch: delete $patch: delete
@@ -29,7 +29,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
$patch: delete $patch: delete

4
manifests/site/virtual-network-cloud/ephemeral/catalogues/cleanup/smp.yaml
View File

@@ -11,7 +11,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
$patch: delete $patch: delete
@@ -23,7 +23,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
$patch: delete $patch: delete

23
manifests/site/virtual-network-cloud/ephemeral/catalogues/networking.yaml
View File

@@ -2,19 +2,20 @@
# ephemeral cluster, on top of the target cluster networking definition. # ephemeral cluster, on top of the target cluster networking definition.
# These values can be overridden at the site, type, etc levels as appropriate. # These values can be overridden at the site, type, etc levels as appropriate.
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
# The catalogue should be overridden as appropriate for different kubernetes spec:
# clusters, e.g. ephemeral vs target vs tenant # The catalogue should be overridden as appropriate for different kubernetes
kubernetes: # clusters, e.g. ephemeral vs target vs tenant
podCidr: "192.168.0.0/24" kubernetes:
controlPlaneEndpoint: podCidr: "192.168.0.0/24"
host: "10.23.25.101" controlPlaneEndpoint:
apiserverCertSANs: "[10.23.25.101, 10.23.24.101]" host: "10.23.25.101"
apiserverCertSANs: "[10.23.25.101, 10.23.24.101]"
ironic: ironic:
provisioningIp: "10.23.24.101" provisioningIp: "10.23.24.101"
dhcpRange: "10.23.24.200,10.23.24.250" dhcpRange: "10.23.24.200,10.23.24.250"

4
manifests/site/virtual-network-cloud/ephemeral/controlplane/hostgenerator/patch-delete-catalogues.yaml
View File

@@ -17,7 +17,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
$patch: delete $patch: delete
@@ -29,7 +29,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
$patch: delete $patch: delete

14
manifests/site/virtual-network-cloud/ephemeral/controlplane/versions-catalogue-patch.yaml
View File

@@ -1,11 +1,13 @@
# Patch the versions catalogue to use the site-specific local image URL # Patch the versions catalogue to use the site-specific local image URL
# TODO: patch this in from a site-networking catalogue in the future # TODO: patch this in from a site-networking catalogue in the future
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
files:
k8scontrol: spec:
cluster_controlplane_image: files:
url: http://10.23.24.1:8099/target-image.qcow2 k8scontrol:
checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum cluster_controlplane_image:
url: http://10.23.24.1:8099/target-image.qcow2
checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum

4
manifests/site/virtual-network-cloud/target/catalogues/cleanup/smp.yaml
View File

@@ -11,7 +11,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
$patch: delete $patch: delete
@@ -23,7 +23,7 @@ patches: |-
$patch: delete $patch: delete
--- ---
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
$patch: delete $patch: delete

21
manifests/site/virtual-network-cloud/target/catalogues/networking.yaml
View File

@@ -2,18 +2,19 @@
# ephemeral cluster, on top of the target cluster networking definition. # ephemeral cluster, on top of the target cluster networking definition.
# These values can be overridden at the site, type, etc levels as appropriate. # These values can be overridden at the site, type, etc levels as appropriate.
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
name: networking name: networking
# The catalogue should be overridden as appropriate for different kubernetes spec:
# clusters, e.g. ephemeral vs target vs tenant # The catalogue should be overridden as appropriate for different kubernetes
kubernetes: # clusters, e.g. ephemeral vs target vs tenant
controlPlaneEndpoint: kubernetes:
host: "10.23.25.102" controlPlaneEndpoint:
apiserverCertSANs: "[10.23.25.102, 10.23.24.102]" host: "10.23.25.102"
apiserverCertSANs: "[10.23.25.102, 10.23.24.102]"
ironic: ironic:
provisioningIp: "10.23.24.102" provisioningIp: "10.23.24.102"
dhcpRange: "10.23.24.200,10.23.24.250" dhcpRange: "10.23.24.200,10.23.24.250"

15
manifests/site/virtual-network-cloud/target/catalogues/versions-airshipctl.yaml
View File

@@ -1,12 +1,13 @@
# Override default controlplane image location # Override default controlplane image location
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VersionsCatalogue
metadata: metadata:
name: versions-airshipctl name: versions-airshipctl
files: spec:
k8scontrol: files:
# Host the image in a locally served location for CI k8scontrol:
cluster_controlplane_image: # Host the image in a locally served location for CI
url: http://10.23.24.1:8099/target-image.qcow2 cluster_controlplane_image:
checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum url: http://10.23.24.1:8099/target-image.qcow2
checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum

76
manifests/type/airship-core/shared/catalogues/networking.yaml
View File

@@ -1,45 +1,45 @@
# The default networking catalogue for functions hosted in the airshipctl project. # The default networking catalogue for functions hosted in the airshipctl project.
# These values can be overridden at the site, type, etc levels as appropriate. # These values can be overridden at the site, type, etc levels as appropriate.
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: NetworkCatalogue
metadata: metadata:
labels: labels:
airshipit.org/deploy-k8s: "false" airshipit.org/deploy-k8s: "false"
name: networking name: networking
spec:
# This section is only relevant when using Metal3 BareMetalHosts, and # This section is only relevant when using Metal3 BareMetalHosts, and
# is consumed by the `hostgenerator-m3` function. # is consumed by the `hostgenerator-m3` function.
# It defines host-level networking that is common across all BMHs in a site, # 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. # and will typically be fully overridden at the Type and Site level.
commonHostNetworking: commonHostNetworking:
links: links:
- id: oam - id: oam
name: oam name: oam
type: phy type: phy
mtu: "1500" mtu: "1500"
# ethernet_mac_address: <from host-catalogue> (optional) # ethernet_mac_address: <from host-catalogue> (optional)
- id: pxe - id: pxe
name: pxe name: pxe
type: phy type: phy
mtu: "1500" mtu: "1500"
# ethernet_mac_address: <from host-catalogue> (optional) # ethernet_mac_address: <from host-catalogue> (optional)
networks: networks:
- id: oam-ipv4 - id: oam-ipv4
type: ipv4 type: ipv4
link: oam link: oam
# ip_address: <from host-catalogue> # ip_address: <from host-catalogue>
netmask: 255.255.255.0 netmask: 255.255.255.0
routes: routes:
- network: 0.0.0.0 - network: 0.0.0.0
netmask: 0.0.0.0 netmask: 0.0.0.0
gateway: 10.23.25.1 gateway: 10.23.25.1
- id: pxe-ipv4 - id: pxe-ipv4
type: ipv4 type: ipv4
link: pxe link: pxe
# ip_address: <from host-catalogue> # ip_address: <from host-catalogue>
netmask: 255.255.255.0 netmask: 255.255.255.0
services: services:
- address: 8.8.8.8 - address: 8.8.8.8
type: dns type: dns
- address: 8.8.4.4 - address: 8.8.4.4
type: dns type: dns

2
playbooks/airship-treasuremap-gate-runner.yaml
View File

@@ -16,7 +16,7 @@
environment: environment:
SOPS_IMPORT_PGP: "{{ airship_config_pgp }}" SOPS_IMPORT_PGP: "{{ airship_config_pgp }}"
SOPS_PGP_FP: "{{ airship_config_pgp_fp }}" SOPS_PGP_FP: "{{ airship_config_pgp_fp }}"
AIRSHIPCTL_REF: "681f8547c989e862d155f2e9f2c794c89326d931" AIRSHIPCTL_REF: "5820e22d9f436df2f93d8b71286b2ad0492279bc"
tasks: tasks:
- name: "set default gate scripts" - name: "set default gate scripts"
set_fact: set_fact: