airship
/
treasuremap
Code Issues Proposed changes

Merge "Add SIP scheduling labels to catalogues & SIP CR"

This commit is contained in:
Zuul 2021-07-14 08:18:04 +00:00 committed by Gerrit Code Review
parent 7e67ce575b 6830bf3ed3
commit 54809933ac
6 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,3 +11,11 @@ patchesJson6902:
kind: KubeadmControlPlane
name: cluster-controlplane
path: iptables-setup.yaml
patchesJson6902:
- target:
group: infrastructure.cluster.x-k8s.io
version: v1alpha4
kind: Metal3Cluster
name: target-cluster
path: labelsync-setup.yaml

5
manifests/function/k8scontrol-vm-infra/labelsync-setup.yaml Normal file
View File

@ -0,0 +1,5 @@
# This configures Metal3Cluster resources for label syncing
- op: add
path: "/metadata/annotations"
value:
metal3.io/metal3-label-sync-prefixes: "airshipit.org"

19
manifests/site/reference-multi-tenant/target/catalogues/hosts.yaml
View File

@ -25,6 +25,9 @@ hosts:
storage-ipv4: 172.62.0.11
calico-ipv4: 172.64.0.11
hardwareProfile: default # defined in the hostgenerator-m3 function
labels:
airshipit.org/rack: r01
airshipit.org/server: stl3r01s01
stl3r01s02:
bootMode: legacy
macAddress: E4:43:4B:EE:B0:43
@ -38,6 +41,9 @@ hosts:
storage-ipv4: 172.62.0.12
calico-ipv4: 172.64.0.12
hardwareProfile: default
labels:
airshipit.org/rack: r01
airshipit.org/server: stl3r01s02
stl3r01s03:
bootMode: legacy
#macAddress: E4:43:4B:EE:D7:B8
@ -52,6 +58,9 @@ hosts:
storage-ipv4: 172.62.0.13
calico-ipv4: 172.64.0.13
hardwareProfile: default # defined in the hardwareprofile-example function
labels:
airshipit.org/rack: r01
airshipit.org/server: stl3r01s03
stl3r01s04:
bootMode: legacy
#macAddress: E4:43:4B:EE:D7:B8
@ -67,6 +76,9 @@ hosts:
calico-ipv4: 172.64.0.14
vm-infra-ipv4: 192.168.4.1
hardwareProfile: default # defined in the hardwareprofile-example function
labels:
airshipit.org/rack: r01
airshipit.org/server: stl3r01s04
stl3r01s05:
bootMode: legacy
#macAddress: E4:43:4B:EE:D7:B8
@ -82,6 +94,9 @@ hosts:
calico-ipv4: 172.64.0.15
vm-infra-ipv4: 192.168.4.2
hardwareProfile: default # defined in the hardwareprofile-example function
labels:
airshipit.org/rack: r01
airshipit.org/server: stl3r01s05
stl3r01s06:
bootMode: legacy
#macAddress: E4:43:4B:EE:D7:B8
@ -96,3 +111,7 @@ hosts:
storage-ipv4: 172.62.0.16
calico-ipv4: 172.64.0.16
hardwareProfile: default # defined in the hardwareprofile-example function
labels:
airshipit.org/rack: r01
airshipit.org/server: stl3r01s06

17
manifests/site/virtual-network-cloud/target/catalogues/hosts.yaml
View File

@ -23,6 +23,9 @@ hosts:
oam: 52:54:00:9b:27:4c
pxe: 52:54:00:b6:ed:31
hardwareProfile: default # defined in the hostgenerator-m3 function
labels:
airshipit.org/rack: r01
airshipit.org/server: node01
node02:
bootMode: UEFI
macAddress: 52:54:00:b6:ed:02
@ -37,6 +40,9 @@ hosts:
oam: 52:54:00:9b:27:02
pxe: 52:54:00:b6:ed:02
hardwareProfile: default
labels:
airshipit.org/rack: r01
airshipit.org/server: node02
node03:
bootMode: UEFI
macAddress: 52:54:00:b6:ed:23
@ -50,7 +56,10 @@ hosts:
macAddresses:
oam: 52:54:00:9b:27:07
pxe: 52:54:00:b6:ed:23
hardwareProfile: default # defined in the hardwareprofile-example function
hardwareProfile: default
labels:
airshipit.org/rack: r01
airshipit.org/server: node03
node04:
bootMode: UEFI
macAddress: 52:54:00:36:5e:e3
@ -63,4 +72,8 @@ hosts:
macAddresses:
oam: 52:54:00:dc:ab:04
pxe: 52:54:00:51:0b:e4
hardwareProfile: default # defined in the hardwareprofile-example function
hardwareProfile: default
labels:
airshipit.org/rack: r01
airshipit.org/server: node04

8
manifests/type/multi-tenant/sub-clusters/lma/provide-infra/sipcluster.yaml
View File

@ -9,16 +9,16 @@ spec:
ControlPlane:
labelSelector:
matchLabels:
vino.airshipit.org/flavor: control-plane
topologyKey: vino.airshipit.org/rack
airshipit.org/flavor: control-plane
topologyKey: airshipit.org/rack
count:
active: 1
standby: 1
Worker:
labelSelector:
matchLabels:
vino.airshipit.org/flavor: worker
topologyKey: vino.airshipit.org/host
airshipit.org/flavor: worker
topologyKey: airshipit.org/server
count:
active: 2
standby: 1 # Slew for upgrades

8
manifests/type/multi-tenant/sub-clusters/wordpress/provide-infra/sipcluster.yaml
View File

@ -9,16 +9,16 @@ spec:
ControlPlane:
labelSelector:
matchLabels:
vino.airshipit.org/flavor: control-plane
topologyKey: vino.airshipit.org/rack
airshipit.org/flavor: control-plane
topologyKey: airshipit.org/rack
count:
active: 1
standby: 1
Worker:
labelSelector:
matchLabels:
vino.airshipit.org/flavor: worker
topologyKey: vino.airshipit.org/host
airshipit.org/flavor: worker
topologyKey: airshipit.org/server
count:
active: 2
standby: 1 # Slew for upgrades