airship
/
treasuremap
Code Issues Proposed changes

airship-core type and reference site manifest update for 2.1 release 

Update the airshipctl version pin and fixes in the reference type and
site manifests to keep up to date with the airshipctl changes in version 2.1.

Change-Id: I19c1cf874f33eeccba5b0fbc74404dd5d462f55d
This commit is contained in:
James Gu 2021-11-08 20:54:23 +00:00
parent 5afbb354d5
commit be4d17a36e
42 changed files with 133 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/composite/initinfra/kustomization.yaml
View File

@ -1,5 +1,6 @@
resources: resources:
- ../../../../airshipctl/manifests/function/baremetal-operator/ - ../../../../airshipctl/manifests/function/baremetal-operator/v0.5.0
- ../../function/clusterctl - ../../function/clusterctl
- ../../../../airshipctl/manifests/function/ironic-deployment/v0.5.0
commonLabels: commonLabels:
airshipit.org/stage: initinfra airshipit.org/stage: initinfra

3
manifests/composite/initinfra/replacements/kustomization.yaml
View File

@ -1,3 +1,4 @@
resources: resources:
- ../../../../../airshipctl/manifests/function/baremetal-operator/replacements - ../../../../../airshipctl/manifests/function/baremetal-operator/v0.5.0/replacements
- ../../../function/clusterctl/replacements - ../../../function/clusterctl/replacements
- ../../../../../airshipctl/manifests/function/ironic-deployment/v0.5.0/replacements

2
manifests/function/hostconfig-operator/kustomization.yaml
View File

@ -3,6 +3,8 @@ kind: Kustomization
resources: resources:
#- hostconfigs_crd.yaml #- hostconfigs_crd.yaml
- hostconfig.airshipit.org_hostconfigs_crd.yaml - hostconfig.airshipit.org_hostconfigs_crd.yaml
- namespace.yaml
- rbac - rbac
- deployment.yaml - deployment.yaml
- ssh-key.yaml - ssh-key.yaml
namespace: host-config-operator

4
manifests/function/hostconfig-operator/namespace.yaml Normal file
View File

@ -0,0 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: host-config-operator

4
manifests/function/hostconfig-operator/replacements/ssh-key-replacement.yaml
View File

@ -11,8 +11,8 @@ replacements:
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
name: generated-secrets name: combined-target-secrets
fieldref: "{.sshKeys.privateKey}" fieldref: ".secretGroups.[name=targetSshSecrets].values.[name=privateKey].data"
target: target:
objref: objref:
kind: Secret kind: Secret

4
manifests/function/k8scontrol-ha/kustomization.yaml
View File

@ -4,12 +4,12 @@ kind: Kustomization
namespace: target-infra namespace: target-infra
resources: resources:
- ../k8scontrol-oidc - ../../../../airshipctl/manifests/function/k8scontrol
patches: patches:
- target: - target:
group: controlplane.cluster.x-k8s.io group: controlplane.cluster.x-k8s.io
version: v1alpha3 version: v1alpha4
kind: KubeadmControlPlane kind: KubeadmControlPlane
path: vrrp_keepalived_patch.yaml path: vrrp_keepalived_patch.yaml

2
manifests/function/k8scontrol-ha/replacements/kustomization.yaml
View File

@ -1,3 +1,3 @@
resources: resources:
- ../../k8scontrol-oidc/replacements - ../../../../../airshipctl/manifests/function/k8scontrol/replacements
- networking-ha.yaml - networking-ha.yaml

4
manifests/function/k8scontrol-oidc/kustomization.yaml
View File

@ -8,12 +8,12 @@ resources:
patches: patches:
- target: - target:
group: controlplane.cluster.x-k8s.io group: controlplane.cluster.x-k8s.io
version: v1alpha3 version: v1alpha4
kind: KubeadmControlPlane kind: KubeadmControlPlane
path: oidc-apiserver-ca-cert.json path: oidc-apiserver-ca-cert.json
- target: - target:
group: controlplane.cluster.x-k8s.io group: controlplane.cluster.x-k8s.io
version: v1alpha3 version: v1alpha4
kind: KubeadmControlPlane kind: KubeadmControlPlane
path: oidc-apiserver-extra-args.yaml path: oidc-apiserver-extra-args.yaml

2
manifests/function/k8scontrol-oidc/oidc-apiserver-extra-args.yaml
View File

@ -1,4 +1,4 @@
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4
kind: KubeadmControlPlane kind: KubeadmControlPlane
metadata: metadata:
name: cluster-controlplane name: cluster-controlplane

2
manifests/function/k8scontrol-vm-infra/kustomization.yaml
View File

@ -7,7 +7,7 @@ resources:
patchesJson6902: patchesJson6902:
- target: - target:
group: controlplane.cluster.x-k8s.io group: controlplane.cluster.x-k8s.io
version: v1alpha3 version: v1alpha4
kind: KubeadmControlPlane kind: KubeadmControlPlane
name: cluster-controlplane name: cluster-controlplane
path: iptables-setup.yaml path: iptables-setup.yaml

3
manifests/function/treasuremap-cleanup/kustomization.yaml
View File

@ -1,3 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources: resources:
- ../../../../airshipctl/manifests/function/airshipctl-cleanup/ - ../../../../airshipctl/manifests/function/airshipctl-cleanup/
# place here more treasuremap specific catalogue kinds # place here more treasuremap specific catalogue kinds

2
manifests/function/workers-vm-infra/kustomization.yaml
View File

@ -7,7 +7,7 @@ resources:
patchesJson6902: patchesJson6902:
- target: - target:
group: bootstrap.cluster.x-k8s.io group: bootstrap.cluster.x-k8s.io
version: v1alpha3 version: v1alpha4
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
name: worker-1 name: worker-1
path: iptables-setup.yaml path: iptables-setup.yaml

3
manifests/site/reference-airship-core/encrypted/encryption-keys/kustomization.yaml Normal file
View File

@ -0,0 +1,3 @@
resources:
- ../../ephemeral/catalogues/public-keys/
- ../../target/catalogues/public-keys/

3
manifests/site/reference-airship-core/encrypted/get/kustomization.yaml Normal file
View File

@ -0,0 +1,3 @@
resources:
- ../../ephemeral/catalogues/encrypted
- ../../target/catalogues/encrypted

12
manifests/site/reference-airship-core/encrypted/update/kustomization.yaml Normal file
View File

@ -0,0 +1,12 @@
resources:
- ../get/
- ../encryption-keys/
- secrets.yaml
- ../../../../../../airshipctl/manifests/function/templater-helpers/secret-generator/ # libs needed for generator
transformers:
- ../../../../type/airship-core/shared/update-secrets/
- ../../../../../../airshipctl/manifests/function/templater-helpers/cleanup/ # remove libs after using in all generators
- ../../../../type/airship-core/shared/update-secrets/fileplacement # update paths for imports
- ../../../../type/airship-core/shared/encrypt-secrets
- ../../../../type/airship-core/shared/encrypt-secrets/cleanup

15
manifests/site/reference-airship-core/encrypted/update/secrets.yaml Normal file
View File

@ -0,0 +1,15 @@
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
labels:
airshipit.org/deploy-k8s: 'false'
name: combined-ephemeral-secrets-import
secretGroups: []
---
apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue
metadata:
labels:
airshipit.org/deploy-k8s: 'false'
name: combined-target-secrets-import
secretGroups: []

3
manifests/site/reference-airship-core/ephemeral/bootstrap/baremetalhost.yaml
View File

@ -23,6 +23,7 @@ status:
ID: "" ID: ""
operationHistory: {} operationHistory: {}
errorMessage: "" errorMessage: ""
hardwareProfile: "" hardwareProfile: "default"
operationalStatus: "" operationalStatus: ""
poweredOn: false poweredOn: false
errorCount: 0

7
manifests/site/reference-airship-core/ephemeral/catalogues/shareable/networking.yaml
View File

@ -2,7 +2,6 @@
# 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.
## NEWSITE_CHANGEME: update file with ephemeral node ips
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: NetworkCatalogue kind: NetworkCatalogue
metadata: metadata:
@ -19,12 +18,6 @@ spec:
apiserverCertSANs: "[172.64.0.12, 172.63.0.12]" apiserverCertSANs: "[172.64.0.12, 172.63.0.12]"
ironic: ironic:
# NEWSITE_CHANGEME: Ephemeral node PXE network # NEWSITE_CHANGEME: Ephemeral node PXE network
deployKernelUrl: http://172.63.0.12:80/images/ipa-ubuntu-master.kernel
deployRamdiskUrl: http://172.63.0.12:80/images/ipa-ubuntu-master.initramfs
httpPort: 6180
ironicFastTrack: "false"
ironicEndpoint: http://172.63.0.12:6385/v1/
ironicInspectorEndpoint: http://172.63.0.12:5050/v1/
provisioningInterface: "eno4" provisioningInterface: "eno4"
provisioningIp: "172.63.0.12" provisioningIp: "172.63.0.12"
dhcpRange: "172.63.0.31,172.63.0.126" dhcpRange: "172.63.0.31,172.63.0.126"

3
manifests/site/reference-airship-core/kubeconfig/kustomization.yaml
View File

@ -1,6 +1,7 @@
resources: resources:
- kubeconfig.yaml - kubeconfig.yaml
- ../target/catalogues - ../target/catalogues/encrypted
- ../ephemeral/catalogues/encrypted
transformers: transformers:
- update-target.yaml - update-target.yaml

24
manifests/site/reference-airship-core/kubeconfig/update-target.yaml
View File

@ -10,8 +10,8 @@ replacements:
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
name: generated-secrets name: combined-target-secrets
fieldref: "{.targetKubeconfig.certificate-authority-data}" fieldref: ".secretGroups.[name=targetK8sSecrets].values.[name=caCrt].data"
target: target:
objref: objref:
kind: KubeConfig kind: KubeConfig
@ -20,8 +20,8 @@ replacements:
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
name: generated-secrets name: combined-target-secrets
fieldref: "{.targetKubeconfig.client-certificate-data}" fieldref: ".secretGroups.[name=targetK8sSecrets].values.[name=crt].data"
target: target:
objref: objref:
kind: KubeConfig kind: KubeConfig
@ -30,8 +30,8 @@ replacements:
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
name: generated-secrets name: combined-target-secrets
fieldref: "{.targetKubeconfig.client-key-data}" fieldref: ".secretGroups.[name=targetK8sSecrets].values.[name=key].data"
target: target:
objref: objref:
kind: KubeConfig kind: KubeConfig
@ -40,8 +40,8 @@ replacements:
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
name: generated-secrets name: combined-ephemeral-secrets
fieldref: "{.ephemeralKubeconfig.certificate-authority-data}" fieldref: ".secretGroups.[name=ephemeralK8sSecrets].values.[name=caCrt].data"
target: target:
objref: objref:
kind: KubeConfig kind: KubeConfig
@ -50,8 +50,8 @@ replacements:
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
name: generated-secrets name: combined-ephemeral-secrets
fieldref: "{.ephemeralKubeconfig.client-certificate-data}" fieldref: ".secretGroups.[name=ephemeralK8sSecrets].values.[name=crt].data"
target: target:
objref: objref:
kind: KubeConfig kind: KubeConfig
@ -60,8 +60,8 @@ replacements:
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
name: generated-secrets name: combined-ephemeral-secrets
fieldref: "{.ephemeralKubeconfig.client-key-data}" fieldref: ".secretGroups.[name=ephemeralK8sSecrets].values.[name=key].data"
target: target:
objref: objref:
kind: KubeConfig kind: KubeConfig

6
manifests/type/airship-core/phases/baremetal-plan.yaml → manifests/site/reference-airship-core/phases/baremetal-plan.yaml
View File

@ -1,7 +1,7 @@
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: PhasePlan kind: PhasePlan
metadata: metadata:
name: deploy-baremetal name: deploy-gating
description: "Phase plan for airship-core deployment on bare metals" description: "Phase plan for airship-core deployment on bare metals"
phases: phases:
# Deploy ephemeral node using redfish with iso # Deploy ephemeral node using redfish with iso
@ -99,11 +99,13 @@ phases:
# To get ConfigMap for this phase, execute `airshipctl phase render --source config -k ConfigMap` # To get ConfigMap for this phase, execute `airshipctl phase render --source config -k ConfigMap`
# and find ConfigMap with name kubectl-wait-cluster # and find ConfigMap with name kubectl-wait-cluster
- name: kubectl-wait-cluster-target - name: kubectl-wait-cluster-target
# Eject virtual media Ephemeral baremetal host to ensure it can reused.
- name: eject-virtual-media-ephemeral
# Power off Ephemeral baremetal host avoid DHCP conflict # Power off Ephemeral baremetal host avoid DHCP conflict
- name: power-off-ephemeral - name: power-off-ephemeral
# (TODO) Need to add manifests for controlplane-target phase # (TODO) Need to add manifests for controlplane-target phase
# Create target k8s cluster resources # Create target k8s cluster resources
# - name: controlplane-target - name: controlplane-target
# List all nodes in target cluster # List all nodes in target cluster
# Scripts for this phase placed in manifests/function/phase-helpers/get_node/ # Scripts for this phase placed in manifests/function/phase-helpers/get_node/
# To get ConfigMap for this phase, execute `airshipctl phase render --source config -k ConfigMap` # To get ConfigMap for this phase, execute `airshipctl phase render --source config -k ConfigMap`

1
manifests/site/reference-airship-core/phases/kustomization.yaml
View File

@ -9,4 +9,5 @@ transformers:
## TODO Consider making a catalogue combined with variable substitution instead ## TODO Consider making a catalogue combined with variable substitution instead
patchesStrategicMerge: patchesStrategicMerge:
- baremetal-plan.yaml
- phase-patch.yaml - phase-patch.yaml

9
manifests/site/reference-airship-core/phases/phase-patch.yaml
View File

@ -10,3 +10,12 @@ spec:
remoteDirect: remoteDirect:
## NEWSITE_CHANGEME: URL to the ephemeral node iso ## NEWSITE_CHANGEME: URL to the ephemeral node iso
isoURL: http://10.254.195.209/ephemeral.iso isoURL: http://10.254.195.209/ephemeral.iso
---
apiVersion: airshipit.org/v1alpha1
kind: BaremetalManager
metadata:
name: PowerOffEphemeral
spec:
hostSelector:
## NEWSITE_CHANGEME: ephemeral node
name: stl3r01s02

13
manifests/site/reference-airship-core/target/catalogues/shareable/hosts.yaml
View File

@ -1,7 +1,6 @@
# Site-level host catalogue. This info feeds the Templater # Site-level host catalogue. This info feeds the Templater
# kustomize plugin config in the hostgenerator-m3 function. # kustomize plugin config in the hostgenerator-m3 function.
## NEWSITE_CHANGEME: update the whole file with the site specific host details
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VariableCatalogue
metadata: metadata:
@ -19,6 +18,8 @@ hosts:
bmcUsername: root bmcUsername: root
bmcPassword: WWTwwt1! bmcPassword: WWTwwt1!
disableCertificateVerification: true disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:F4:CB
ipAddresses: ipAddresses:
oam-ipv4: 10.254.125.230 oam-ipv4: 10.254.125.230
pxe-ipv4: 172.63.0.11 pxe-ipv4: 172.63.0.11
@ -32,6 +33,8 @@ hosts:
bmcUsername: root bmcUsername: root
bmcPassword: WWTwwt1! bmcPassword: WWTwwt1!
disableCertificateVerification: true disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:B0:43
ipAddresses: ipAddresses:
oam-ipv4: 10.254.125.231 oam-ipv4: 10.254.125.231
pxe-ipv4: 172.63.0.12 pxe-ipv4: 172.63.0.12
@ -46,6 +49,8 @@ hosts:
bmcUsername: root bmcUsername: root
bmcPassword: WWTwwt1! bmcPassword: WWTwwt1!
disableCertificateVerification: true disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:D7:D9
ipAddresses: ipAddresses:
oam-ipv4: 10.254.125.232 oam-ipv4: 10.254.125.232
pxe-ipv4: 172.63.0.13 pxe-ipv4: 172.63.0.13
@ -60,6 +65,8 @@ hosts:
bmcUsername: root bmcUsername: root
bmcPassword: WWTwwt1! bmcPassword: WWTwwt1!
disableCertificateVerification: true disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:DD:0F
ipAddresses: ipAddresses:
oam-ipv4: 10.254.125.233 oam-ipv4: 10.254.125.233
pxe-ipv4: 172.63.0.14 pxe-ipv4: 172.63.0.14
@ -74,6 +81,8 @@ hosts:
bmcUsername: root bmcUsername: root
bmcPassword: WWTwwt1! bmcPassword: WWTwwt1!
disableCertificateVerification: true disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:D7:2F
ipAddresses: ipAddresses:
oam-ipv4: 10.254.125.234 oam-ipv4: 10.254.125.234
pxe-ipv4: 172.63.0.15 pxe-ipv4: 172.63.0.15
@ -88,6 +97,8 @@ hosts:
bmcUsername: root bmcUsername: root
bmcPassword: WWTwwt1! bmcPassword: WWTwwt1!
disableCertificateVerification: true disableCertificateVerification: true
macAddresses:
pxe: E4:43:4B:EE:F3:B7
ipAddresses: ipAddresses:
oam-ipv4: 10.254.125.235 oam-ipv4: 10.254.125.235
pxe-ipv4: 172.63.0.16 pxe-ipv4: 172.63.0.16

1
manifests/site/reference-airship-core/target/catalogues/shareable/networking-ha.yaml
View File

@ -1,7 +1,6 @@
# This catalogue alone needs to be overriden at site level based on the # This catalogue alone needs to be overriden at site level based on the
# networkign requirement like HA # networkign requirement like HA
## NEWSITE_CHANGEME: Update the file with the vrrp ips
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VariableCatalogue kind: VariableCatalogue
metadata: metadata:

1
manifests/site/reference-airship-core/target/catalogues/shareable/versions-airshipctl.yaml
View File

@ -1,6 +1,5 @@
# Override default controlplane image location # Override default controlplane image location
## NEWSITE_CHANGEME: update the file with the ephemeral node pxe ip
apiVersion: airshipit.org/v1alpha1 apiVersion: airshipit.org/v1alpha1
kind: VersionsCatalogue kind: VersionsCatalogue
metadata: metadata:

6
manifests/site/reference-airship-core/target/controlplane/kustomization.yaml
View File

@ -7,9 +7,11 @@ resources:
- ../catalogues - ../catalogues
- metal3machinetemplate.yaml - metal3machinetemplate.yaml
namespace: target-infra
patchesStrategicMerge: patchesStrategicMerge:
#- versions-catalogue-patch.yaml - versions-catalogue-patch.yaml
- patch_controlplane.yaml - patch_controlplane.yaml
transformers: transformers:
#- ../../../../../../airshipctl/manifests/function/k8scontrol/replacements #- ../../../../../../airshipctl/manifests/function/k8scontrol/replacements

12
manifests/site/reference-airship-core/target/controlplane/patch_controlplane.yaml
View File

@ -1,11 +1,11 @@
kind: KubeadmControlPlane kind: KubeadmControlPlane
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3 apiVersion: controlplane.cluster.x-k8s.io/v1alpha4
metadata: metadata:
name: cluster-controlplane name: cluster-controlplane
spec: spec:
replicas: 3 replicas: 3
infrastructureTemplate: machineTemplate:
kind: Metal3MachineTemplate infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4 kind: Metal3MachineTemplate
name: cluster-controlplane-2 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha5
name: cluster-controlplane-2

5
manifests/site/reference-airship-core/target/controlplane/versions-catalogue-patch.yaml
View File

@ -1,7 +1,7 @@
# 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
spec: spec:
@ -10,6 +10,5 @@ spec:
# Host the image in a locally served location for CI # Host the image in a locally served location for CI
cluster_controlplane_image: cluster_controlplane_image:
## NEWSITE_CHANGEME: update with the first target node pxe ip ## NEWSITE_CHANGEME: update with the first target node pxe ip
url: http://172.63.0.11:80/images/ubuntu-18.04-server-cloudimg-amd64.img url: http://172.63.0.11/images/control-plane.qcow2
checksum: "e0d74d3d37e70e4eec1b204f8402ed3c" checksum: "e0d74d3d37e70e4eec1b204f8402ed3c"

2
manifests/site/reference-airship-core/target/workers/provision/kubeadmconfigtemplate.yaml
View File

@ -1,4 +1,4 @@
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
metadata: metadata:
name: worker-1 name: worker-1

8
manifests/site/reference-airship-core/target/workers/provision/machinedeployment.yaml
View File

@ -1,4 +1,4 @@
apiVersion: cluster.x-k8s.io/v1alpha3 apiVersion: cluster.x-k8s.io/v1alpha4
kind: MachineDeployment kind: MachineDeployment
metadata: metadata:
name: worker-1 name: worker-1
@ -17,14 +17,14 @@ spec:
cluster.x-k8s.io/cluster-name: target-cluster cluster.x-k8s.io/cluster-name: target-cluster
spec: spec:
clusterName: target-cluster clusterName: target-cluster
version: v1.18.3 version: v1.19.14
bootstrap: bootstrap:
configRef: configRef:
name: worker-1 name: worker-1
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3 apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
kind: KubeadmConfigTemplate kind: KubeadmConfigTemplate
infrastructureRef: infrastructureRef:
name: worker-1 name: worker-1
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
kind: Metal3MachineTemplate kind: Metal3MachineTemplate
--- ---

1
manifests/site/reference-multi-tenant/ephemeral/bootstrap/baremetalhost.yaml
View File

@ -26,3 +26,4 @@ status:
hardwareProfile: "" hardwareProfile: ""
operationalStatus: "" operationalStatus: ""
poweredOn: false poweredOn: false
errorCount: 0

10
manifests/site/reference-multi-tenant/target/controlplane/patch_controlplane.yaml
View File

@ -4,8 +4,8 @@ metadata:
name: cluster-controlplane name: cluster-controlplane
spec: spec:
replicas: 3 replicas: 3
infrastructureTemplate: machineTemplate:
kind: Metal3MachineTemplate infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4 kind: Metal3MachineTemplate
name: cluster-controlplane-2 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha5
name: cluster-controlplane-2

1
manifests/site/virtual-airship-core/ephemeral/bootstrap/baremetalhost.yaml
View File

@ -24,3 +24,4 @@ status:
hardwareProfile: "" hardwareProfile: ""
operationalStatus: "" operationalStatus: ""
poweredOn: false poweredOn: false
errorCount: 0

1
manifests/site/virtual-airship-core/phases/kustomization.yaml
View File

@ -7,4 +7,5 @@ transformers:
- ../../../../../airshipctl/manifests/function/clusterctl/replacements - ../../../../../airshipctl/manifests/function/clusterctl/replacements
## TODO Consider making a catalogue combined with variable substitution instead ## TODO Consider making a catalogue combined with variable substitution instead
patchesStrategicMerge: patchesStrategicMerge:
- plan-patch.yaml
- phase-patch.yaml - phase-patch.yaml

1
manifests/type/airship-core/phases/plan-patch.yaml → manifests/site/virtual-airship-core/phases/plan-patch.yaml
View File

@ -162,3 +162,4 @@ validation:
- RemoteDirectConfiguration - RemoteDirectConfiguration
- VariableCatalogue - VariableCatalogue
- StorageCatalogue - StorageCatalogue

1
manifests/site/virtual-multi-tenant/ephemeral/bootstrap/baremetalhost.yaml
View File

@ -24,3 +24,4 @@ status:
hardwareProfile: "" hardwareProfile: ""
operationalStatus: "" operationalStatus: ""
poweredOn: false poweredOn: false
errorCount: 0

3
manifests/type/airship-core/phases/kustomization.yaml
View File

@ -4,6 +4,3 @@ resources:
- executors.yaml - executors.yaml
- phases.yaml - phases.yaml
- workload-config.yaml - workload-config.yaml
patchesStrategicMerge:
- plan-patch.yaml

2
manifests/type/airship-core/target/workload/kustomization.yaml
View File

@ -6,7 +6,7 @@ resources:
- ../../../../function/ingress - ../../../../function/ingress
- ../../../../function/helm-chart-repository - ../../../../function/helm-chart-repository
- ../../../../function/local-storage - ../../../../function/local-storage
- dex-aio # - dex-aio
patches: patches:
- patch: |- - patch: |-

2
manifests/type/airship-core/target/workload/replacements/kustomization.yaml
View File

@ -1,7 +1,7 @@
resources: resources:
- ../../../../../composite/storage-cluster/replacements - ../../../../../composite/storage-cluster/replacements
- ../../../../../function/ingress/replacements - ../../../../../function/ingress/replacements
- ../../../../../function/dex-aio/replacements # - ../../../../../function/dex-aio/replacements
- ../../../../../function/helm-chart-repository/replacements - ../../../../../function/helm-chart-repository/replacements
- ../../../../../function/local-storage/replacements - ../../../../../function/local-storage/replacements
- ../../../../../composite/lma-infra/replacements - ../../../../../composite/lma-infra/replacements

7
manifests/type/multi-tenant/sub-clusters/lma/controlplane/patches/controlplane.yaml
View File

@ -3,5 +3,8 @@ apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
metadata: metadata:
name: cluster-controlplane name: cluster-controlplane
spec: spec:
infrastructureTemplate: machineTemplate:
name: cluster-controlplane-lma infrastructureRef:
kind: Metal3MachineTemplate
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha5
name: cluster-controlplane-lma

2
zuul.d/projects.yaml
View File

@ -14,7 +14,7 @@
vars: vars:
# NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin # NOTE(drewwalters96): Set AIRSHIPCTL_REF to a commit SHA in order to pin
# the cloned version of airshipctl to a known/compatible reference. # the cloned version of airshipctl to a known/compatible reference.
AIRSHIPCTL_REF: 1faeb29f43f876e9d1d7be203f2848185ee1aced AIRSHIPCTL_REF: e8992a6bed6a586f44f50f174276b4b57f8b2c65
sphinx_build_dir: docs/build sphinx_build_dir: docs/build
check: check:
jobs: jobs: