Tune down airship-core networking etc
* This commit updates the manifests to one controller and one worker node * Since there is just one controller, HA for network is removed. * Manifests are updated to use flat networks instead of bonded network Closes: #148 Change-Id: I8c2fbef3288ff3923655b8ac146a0bad657f3012
This commit is contained in:
Snehal
parent
f819f6c510
commit
37507e44bb
|
|
@ -1,4 +1,3 @@
|
|||
resources:
|
||||
- versions-treasuremap.yaml
|
||||
- networking-ha.yaml
|
||||
- utility-treasuremap.yaml
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ metadata:
|
|||
airshipit.org/ephemeral-node: "true"
|
||||
airshipit.org/deploy-k8s: "false"
|
||||
# NEWSITE_CHANGEME : ephemeral node name
|
||||
name: stl3r01s02
|
||||
name: eric01
|
||||
spec:
|
||||
online: true
|
||||
bmc:
|
||||
|
|
|
|||
|
|
@ -8,4 +8,4 @@ metadata:
|
|||
hosts:
|
||||
m3:
|
||||
## NEWSITE_CHANGEME: The ephemeral node name
|
||||
- stl3r01s02
|
||||
- eric01
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ spec:
|
|||
# NEWSITE_CHANGEME: Ephemeral node oam ip
|
||||
host: "10.254.125.231"
|
||||
port: 6443
|
||||
# NEWSITE_CHANGEME: ephemeral node calico ip and pxe ip
|
||||
apiserverCertSANs: "[172.64.0.12, 172.63.0.12]"
|
||||
# NEWSITE_CHANGEME: ephemeral node oam ip and pxe ip
|
||||
apiserverCertSANs: "[10.254.125.231, 172.63.0.12]"
|
||||
ironic:
|
||||
# NEWSITE_CHANGEME: Ephemeral node PXE network
|
||||
deployKernelUrl: http://172.63.0.12:80/images/ipa-ubuntu-master.kernel
|
||||
|
|
|
|||
|
|
@ -8,4 +8,4 @@ metadata:
|
|||
hosts:
|
||||
m3:
|
||||
## NEWSITE_CHANGEME: Target cluster first node
|
||||
- stl3r01s01
|
||||
- eric02
|
||||
|
|
|
|||
|
|
@ -10,9 +10,5 @@ hosts:
|
|||
# Note: this list should be kept up to date with
|
||||
# the full list of hosts in the cluster
|
||||
## NEWSITE_CHANGEME: list of all the hosts
|
||||
- stl3r01s01
|
||||
- stl3r01s02
|
||||
- stl3r01s03
|
||||
- stl3r01s04
|
||||
- stl3r01s05
|
||||
- stl3r01s06
|
||||
- eric01
|
||||
- eric02
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ config:
|
|||
clusters:
|
||||
- cluster:
|
||||
certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURWRENDQWp5Z0F3SUJBZ0lVTUNwc09vRXhyRzdnRTVMOVJSamdnT01UOG53d0RRWUpLb1pJaHZjTkFRRUwKQlFBd0dURVhNQlVHQTFVRUF3d09TM1ZpWlhKdVpYUmxjeUJCVUVrd0hoY05NakF3T1RFMU1ERXdORE0zV2hjTgpNekF3T1RFek1ERXdORE0zV2pBWk1SY3dGUVlEVlFRRERBNUxkV0psY201bGRHVnpJRUZRU1RDQ0FTSXdEUVlKCktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUtBZFo0UWJHZmlLTExpTXNHcFJKS3d5ZkRGWVI5U0MKbGtVb3hlTU1BZVBkeVNNU0paTTlFMFBOaDM5TUtTVjNSZDRIZWt1eGdHK3J4em83WmcrZU1aY1hyNFk3ektQMwo1SW0vaERkMm1TYThsMEkxZTRwV3B0Z25vZjdvRWJpSXVIU2YxQmRhMU4wWm1EUUdtckxyQnFOZFE3c1BVenNWCllPejZVUFZlamNIeEFjMXBvMWZsQXYrWVNZejVXa28wRVRnTXZYRGtxT0hrWFc1WnhPcHBVbiszOVpvWTZMK3gKVmUwUHFQdHlmSVZ1M3dtcnZFNGd4SmxtWEk3dUxmdzZONHpwS2RuK0k0K1RJRWF5aE1EMWRRenNwQzRMM0IrcApYcHFPMWNWM2ZKMlBycS9mNU14SnIxWTVHUTZlQlZyTGVod1ZWTEhEMzF3ZWFpZ3UzeStyM3RVQ0F3RUFBYU9CCmt6Q0JrREFkQmdOVkhRNEVGZ1FVT1d5YTNFd2J5c25UUy9ZajFWTEtjMGh4aDRvd1ZBWURWUjBqQkUwd1M0QVUKT1d5YTNFd2J5c25UUy9ZajFWTEtjMGh4aDRxaEhhUWJNQmt4RnpBVkJnTlZCQU1NRGt0MVltVnlibVYwWlhNZwpRVkJKZ2hRd0ttdzZnVEdzYnVBVGt2MUZHT0NBNHhQeWZEQU1CZ05WSFJNRUJUQURBUUgvTUFzR0ExVWREd1FFCkF3SUJCakFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBTVp1U2tJbTdQdlA4MW5HSjlYOVZFOFVZTVdDSU5GMEEKYit1UURFaHRGc0dxdnZFZHhQcURUWUpwdlF1SUJlOVd0cmlWRzh0MENIL1NnZ0g2TlJod0wyYkJwMm5WaEFVVwphK3hZL1RpTmMzUEl5RHNFeEY3VHVENGJzaW1BQUJTZ2ZtbXRxV1dqajRyOStodS9vZ09jLzQyYk9JT0JWbHNkCi9VNzBiR3dZQjU5QXgvL2dIWVJmVDl3L3p0VHBvY2tzdEhhSjZsVDd5SFlqYUkzaU5EWnZNSnFRSWNxME4vTEMKcVBjWjBWQXBMUTZRUHRpMWpVSzBGM1VlZEF6TVc3ZFF4NkV3Qjd5UHo4NWdZS3ZJdWdyaStrc2YwbGMyeHVDRwpXTGg2YjFNWk9Cc1NZNkppVHpSUUpYdXNCRUdaTGN5VkRJSEU3Y0Q4NWhOQmZpdDAvejFmZlE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t
|
||||
## NEWSITE_CHANGEME: update ip with the vrrp k8s ip
|
||||
server: https://10.254.125.239:6443
|
||||
## NEWSITE_CHANGEME: update ip with the k8s ip
|
||||
server: https://10.254.125.230:6443
|
||||
name: target-cluster
|
||||
- cluster:
|
||||
certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1USXlOakE0TWpneU5Gb1hEVEk1TVRJeU16QTRNamd5TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTFSClM0d3lnajNpU0JBZjlCR0JUS1p5VTFwYmdDaGQ2WTdJektaZWRoakM2K3k1ZEJpWm81ZUx6Z2tEc2gzOC9YQ1MKenFPS2V5cE5RcDN5QVlLdmJKSHg3ODZxSFZZNjg1ZDVYVDNaOHNyVVRzVDR5WmNzZHAzV3lHdDM0eXYzNi9BSQoxK1NlUFErdU5JemN6bzNEdWhXR0ZoQjk3VjZwRitFUTBlVWN5bk05c2hkL3AwWVFzWDR1ZlhxaENENVpzZnZUCnBka3UvTWkyWnVGUldUUUtNeGpqczV3Z2RBWnBsNnN0L2ZkbmZwd1Q5cC9WTjRuaXJnMEsxOURTSFFJTHVrU2MKb013bXNBeDJrZmxITWhPazg5S3FpMEloL2cyczRFYTRvWURZemt0Y2JRZ24wd0lqZ2dmdnVzM3pRbEczN2lwYQo4cVRzS2VmVGdkUjhnZkJDNUZNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJek9BL00xWmRGUElzd2VoWjFuemJ0VFNURG4KRHMyVnhSV0VnclFFYzNSYmV3a1NkbTlBS3MwVGR0ZHdEbnBEL2tRYkNyS2xEeFF3RWg3NFZNSFZYYkFadDdsVwpCSm90T21xdXgxYThKYklDRTljR0FHRzFvS0g5R29jWERZY0JzOTA3ckxIdStpVzFnL0xVdG5hN1dSampqZnBLCnFGelFmOGdJUHZIM09BZ3B1RVVncUx5QU8ya0VnelZwTjZwQVJxSnZVRks2TUQ0YzFmMnlxWGxwNXhrN2dFSnIKUzQ4WmF6d0RmWUVmV3Jrdld1YWdvZ1M2SktvbjVEZ0Z1ZHhINXM2Snl6R3lPVnZ0eG1TY2FvOHNxaCs3UXkybgoyLzFVcU5ZK0hlN0x4d04rYkhwYkIxNUtIMTU5ZHNuS3BRbjRORG1jSTZrVnJ3MDVJMUg5ZGRBbGF0bz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ metadata:
|
|||
spec:
|
||||
hostSelector:
|
||||
## NEWSITE_CHANGEME: ephemeral node
|
||||
name: stl3r01s02
|
||||
name: eric01
|
||||
operationOptions:
|
||||
remoteDirect:
|
||||
## NEWSITE_CHANGEME: URL to the ephemeral node iso
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ metadata:
|
|||
hosts:
|
||||
# NEWSITE_CHANGEME: update with the site specific host details for all hosts
|
||||
m3:
|
||||
stl3r01s01:
|
||||
eric02:
|
||||
bootMode: legacy
|
||||
macAddress: E4:43:4B:EE:F4:CB
|
||||
bmcAddress: redfish+https://10.253.200.35/redfish/v1/Systems/System.Embedded.1
|
||||
|
|
@ -22,10 +22,8 @@ hosts:
|
|||
ipAddresses:
|
||||
oam-ipv4: 10.254.125.230
|
||||
pxe-ipv4: 172.63.0.11
|
||||
storage-ipv4: 172.62.0.11
|
||||
calico-ipv4: 172.64.0.11
|
||||
hardwareProfile: default # defined in the hostgenerator-m3 function
|
||||
stl3r01s02:
|
||||
eric01:
|
||||
bootMode: legacy
|
||||
macAddress: E4:43:4B:EE:B0:43
|
||||
bmcAddress: redfish+https://10.253.200.36/redfish/v1/Systems/System.Embedded.1
|
||||
|
|
@ -35,62 +33,4 @@ hosts:
|
|||
ipAddresses:
|
||||
oam-ipv4: 10.254.125.231
|
||||
pxe-ipv4: 172.63.0.12
|
||||
storage-ipv4: 172.62.0.12
|
||||
calico-ipv4: 172.64.0.12
|
||||
hardwareProfile: default
|
||||
stl3r01s03:
|
||||
bootMode: legacy
|
||||
#macAddress: E4:43:4B:EE:D7:B8
|
||||
macAddress: E4:43:4B:EE:D7:D9
|
||||
bmcAddress: redfish+https://10.253.200.37/redfish/v1/Systems/System.Embedded.1
|
||||
bmcUsername: root
|
||||
bmcPassword: WWTwwt1!
|
||||
disableCertificateVerification: true
|
||||
ipAddresses:
|
||||
oam-ipv4: 10.254.125.232
|
||||
pxe-ipv4: 172.63.0.13
|
||||
storage-ipv4: 172.62.0.13
|
||||
calico-ipv4: 172.64.0.13
|
||||
hardwareProfile: default # defined in the hardwareprofile-example function
|
||||
stl3r01s04:
|
||||
bootMode: legacy
|
||||
#macAddress: E4:43:4B:EE:D7:B8
|
||||
macAddress: E4:43:4B:EE:DD:0F
|
||||
bmcAddress: redfish+https://10.253.200.38/redfish/v1/Systems/System.Embedded.1
|
||||
bmcUsername: root
|
||||
bmcPassword: WWTwwt1!
|
||||
disableCertificateVerification: true
|
||||
ipAddresses:
|
||||
oam-ipv4: 10.254.125.233
|
||||
pxe-ipv4: 172.63.0.14
|
||||
storage-ipv4: 172.62.0.14
|
||||
calico-ipv4: 172.64.0.14
|
||||
hardwareProfile: default # defined in the hardwareprofile-example function
|
||||
stl3r01s05:
|
||||
bootMode: legacy
|
||||
#macAddress: E4:43:4B:EE:D7:B8
|
||||
macAddress: E4:43:4B:EE:D7:2F
|
||||
bmcAddress: redfish+https://10.253.200.39/redfish/v1/Systems/System.Embedded.1
|
||||
bmcUsername: root
|
||||
bmcPassword: WWTwwt1!
|
||||
disableCertificateVerification: true
|
||||
ipAddresses:
|
||||
oam-ipv4: 10.254.125.234
|
||||
pxe-ipv4: 172.63.0.15
|
||||
storage-ipv4: 172.62.0.15
|
||||
calico-ipv4: 172.64.0.15
|
||||
hardwareProfile: default # defined in the hardwareprofile-example function
|
||||
stl3r01s06:
|
||||
bootMode: legacy
|
||||
#macAddress: E4:43:4B:EE:D7:B8
|
||||
macAddress: E4:43:4B:EE:F3:B7
|
||||
bmcAddress: redfish+https://10.253.200.40/redfish/v1/Systems/System.Embedded.1
|
||||
bmcUsername: root
|
||||
bmcPassword: WWTwwt1!
|
||||
disableCertificateVerification: true
|
||||
ipAddresses:
|
||||
oam-ipv4: 10.254.125.235
|
||||
pxe-ipv4: 172.63.0.16
|
||||
storage-ipv4: 172.62.0.16
|
||||
calico-ipv4: 172.64.0.16
|
||||
hardwareProfile: default # defined in the hardwareprofile-example function
|
||||
|
|
|
|||
|
|
@ -9,4 +9,3 @@ resources:
|
|||
patchesStrategicMerge:
|
||||
- versions-airshipctl.yaml
|
||||
- networking.yaml
|
||||
- networking-ha.yaml
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
# This catalogue alone needs to be overriden at site level based on the
|
||||
# networkign requirement like HA
|
||||
|
||||
## NEWSITE_CHANGEME: Update the file with the vrrp ips
|
||||
apiVersion: airshipit.org/v1alpha1
|
||||
kind: VariableCatalogue
|
||||
metadata:
|
||||
name: networking-ha
|
||||
labels:
|
||||
airshipit.org/deploy-k8s: "false"
|
||||
vrrp:
|
||||
# NEWSITE_CHANGEME: Update kubernetes virtual ip and OAM interface
|
||||
kubernetes:
|
||||
interface: bond0.61
|
||||
virtual_ipaddress: 10.254.125.239
|
||||
# NEWSITE_CHANGEME: Update ingress virtual ip and OAM interface
|
||||
ingress:
|
||||
interface: bond0.61
|
||||
virtual_ipaddress: 10.254.125.240
|
||||
|
|
@ -14,11 +14,11 @@ spec:
|
|||
serviceCidr: "10.96.0.0/12"
|
||||
podCidr: "192.168.0.0/18"
|
||||
controlPlaneEndpoint:
|
||||
# NEWSITE_CHANGEME: below is the vrrp kubernetes virtual ip
|
||||
host: "10.254.125.239"
|
||||
# NEWSITE_CHANGEME: below is the vrrp kubernetes ip
|
||||
host: "10.254.125.230"
|
||||
port: 6443
|
||||
# NEWSITE_CHANGEME: first controller node calico ip and pxe ip
|
||||
apiserverCertSANs: "[172.64.0.11, 172.63.0.11]"
|
||||
# NEWSITE_CHANGEME: first controller node oam ip and pxe ip
|
||||
apiserverCertSANs: "[10.254.125.230, 172.63.0.11]"
|
||||
ironic:
|
||||
# NEWSITE_CHANGEME: update the first controller node PXE network information
|
||||
provisioningInterface: "eno4"
|
||||
|
|
@ -31,62 +31,16 @@ spec:
|
|||
name: eno4
|
||||
type: phy
|
||||
mtu: "1500"
|
||||
# NEWSITE_CHANGEME: 25G Intel XXV710DA2 NIC 1 port 2; the first NIC in the bonded interface
|
||||
# NEWSITE_CHANGEME: OAM network
|
||||
- id: enp94s0f1
|
||||
name: enp94s0f1
|
||||
type: phy
|
||||
mtu: "9100"
|
||||
# NEWSITE_CHANGEME: 25G Intel XXV710DA2 NIC 2 port 1; the second NIC in the bonded interface
|
||||
- id: enp134s0f0
|
||||
name: enp134s0f0
|
||||
type: phy
|
||||
mtu: "9100"
|
||||
- id: bond0
|
||||
name: bond0
|
||||
type: bond
|
||||
# NEWSITE_CHANGEME: update the bond link interface name
|
||||
bond_links: ["enp94s0f1", "enp134s0f0"]
|
||||
bond_mode: 802.3ad
|
||||
bond_xmit_hash_policy: layer3+4
|
||||
bond_miimon: 100
|
||||
mtu: "9100"
|
||||
# NEWSITE_CHANGEME: OAM network
|
||||
- id: bond0.61
|
||||
name: bond0.61
|
||||
type: vlan
|
||||
vlan_link: bond0
|
||||
vlan_id: 61
|
||||
mtu: "9100"
|
||||
vlan_mac_address: null
|
||||
# NEWSITE_CHANGEME: Storage network
|
||||
- id: bond0.62
|
||||
name: bond0.62
|
||||
type: vlan
|
||||
vlan_link: bond0
|
||||
vlan_id: 62
|
||||
mtu: "9100"
|
||||
vlan_mac_address: null
|
||||
# NEWSITE_CHANGEME: Calico network
|
||||
- id: bond0.64
|
||||
name: bond0.64
|
||||
type: vlan
|
||||
vlan_link: bond0
|
||||
vlan_id: 64
|
||||
mtu: "9100"
|
||||
vlan_mac_address: null
|
||||
# unused for now
|
||||
- id: bond0.65
|
||||
name: bond0.65
|
||||
type: vlan
|
||||
vlan_link: bond0
|
||||
vlan_id: 65
|
||||
mtu: "9100"
|
||||
vlan_mac_address: null
|
||||
mtu: "1500"
|
||||
networks:
|
||||
# NEWSITE_CHANGEME: OAM network
|
||||
- id: oam-ipv4
|
||||
type: ipv4
|
||||
link: bond0.61
|
||||
link: enp94s0f1
|
||||
# ip_address: <from host-catalogue>
|
||||
netmask: 255.255.255.224
|
||||
routes:
|
||||
|
|
@ -99,18 +53,6 @@ spec:
|
|||
link: eno4
|
||||
# ip_address: <from host-catalogue>
|
||||
netmask: 255.255.255.128
|
||||
# NEWSITE_CHANGEME: Storage network
|
||||
- id: storage-ipv4
|
||||
type: ipv4
|
||||
link: bond0.62
|
||||
# ip_address:
|
||||
netmask: 255.255.255.128
|
||||
# NEWSITE_CHANGEME: Calico network
|
||||
- id: calico-ipv4
|
||||
type: ipv4
|
||||
link: bond0.64
|
||||
# ip_address:
|
||||
netmask: 255.255.255.128
|
||||
services:
|
||||
# NEWSITE_CHANGEME: DNS servers
|
||||
- address: 8.8.8.8
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ spec:
|
|||
useAllNodes: false # We define per node/per device configuration below
|
||||
useAllDevices: false # We define per node/per device configuration below
|
||||
nodes:
|
||||
- name: stl3r01s05
|
||||
- name: eric01
|
||||
deviceFilter: "^/dev/sd[bc]"
|
||||
- name: stl3r01s06
|
||||
- name: eric02
|
||||
deviceFilter: "^/dev/sd[bc]"
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
# Site-level, phase-specific lists of hosts to generate
|
||||
# This is used by the hostgenerator-m3 function to narrow down the site-level
|
||||
# host-catalogue to just the hosts needed for a particular phase.
|
||||
apiVersion: airshipit.org/v1alpha1
|
||||
kind: VariableCatalogue
|
||||
metadata:
|
||||
name: host-generation-catalogue
|
||||
hosts:
|
||||
m3:
|
||||
## NEWSITE_CHANGEME: update with the list of controlplane hosts
|
||||
- stl3r01s04
|
||||
- stl3r01s05
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ../../../../../../../airshipctl/manifests/function/hostgenerator-m3
|
||||
- ../../../../../../../airshipctl/manifests/function/hardwareprofile-example
|
||||
- ../../catalogues
|
||||
- host-generation.yaml
|
||||
|
||||
|
||||
transformers:
|
||||
- ../../../../../../../airshipctl/manifests/function/hardwareprofile-example/replacements
|
||||
- ../../../../../../../airshipctl/manifests/function/hostgenerator-m3/replacements
|
||||
- ../../../../../function/treasuremap-cleanup
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
apiVersion: builtin
|
||||
kind: PatchStrategicMergeTransformer
|
||||
metadata:
|
||||
name: smp
|
||||
patches: |-
|
||||
---
|
||||
apiVersion: airshipit.org/v1alpha1
|
||||
kind: VariableCatalogue
|
||||
metadata:
|
||||
name: hardwareprofile-example
|
||||
$patch: delete
|
||||
---
|
||||
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
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- nodes
|
||||
#- ../../../../../../airshipctl/manifests/function/k8scontrol
|
||||
- ../../../../function/k8scontrol-ha
|
||||
- ../catalogues
|
||||
- metal3machinetemplate.yaml
|
||||
|
||||
patchesStrategicMerge:
|
||||
#- versions-catalogue-patch.yaml
|
||||
- patch_controlplane.yaml
|
||||
|
||||
transformers:
|
||||
#- ../../../../../../airshipctl/manifests/function/k8scontrol/replacements
|
||||
- ../../../../type/airship-core/ephemeral/controlplane/replacements
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
---
|
||||
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
|
||||
kind: Metal3MachineTemplate
|
||||
metadata:
|
||||
annotations:
|
||||
config.kubernetes.io/path: metal3machinetemplate_cluster-controlplane-2.yaml
|
||||
name: cluster-controlplane-2
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
hostSelector:
|
||||
matchLabels:
|
||||
airshipit.org/k8s-role: controlplane-host
|
||||
image:
|
||||
## NEWSITE_CHANGEME: update the below ips with the first target node pxe ips
|
||||
url: http://172.63.0.11/images/control-plane.qcow2
|
||||
checksum: http://172.63.0.11/images/control-plane.qcow2.md5sum
|
||||
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
|
||||
generators:
|
||||
- ../hostgenerator
|
||||
|
||||
commonLabels:
|
||||
airshipit.org/k8s-role: controlplane-host
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
kind: KubeadmControlPlane
|
||||
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
|
||||
metadata:
|
||||
name: cluster-controlplane
|
||||
spec:
|
||||
replicas: 3
|
||||
infrastructureTemplate:
|
||||
kind: Metal3MachineTemplate
|
||||
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4
|
||||
name: cluster-controlplane-2
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
# 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
|
||||
metadata:
|
||||
name: versions-airshipctl
|
||||
spec:
|
||||
files:
|
||||
k8scontrol:
|
||||
# Host the image in a locally served location for CI
|
||||
cluster_controlplane_image:
|
||||
## 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
|
||||
checksum: "e0d74d3d37e70e4eec1b204f8402ed3c"
|
||||
|
||||
|
|
@ -6,6 +6,4 @@ transformers:
|
|||
|
||||
commonLabels:
|
||||
airshipit.org/stage: initinfra
|
||||
patchesStrategicMerge:
|
||||
- patch_calico.yaml
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
apiVersion: operator.tigera.io/v1
|
||||
kind: Installation
|
||||
metadata:
|
||||
name: default
|
||||
spec:
|
||||
calicoNetwork:
|
||||
nodeAddressAutodetectionV4:
|
||||
firstFound: false
|
||||
## NEWSITE_CHANGEME: update the interface with the calico network
|
||||
interface: "bond0.64"
|
||||
|
|
@ -8,5 +8,4 @@ metadata:
|
|||
hosts:
|
||||
m3:
|
||||
## NEWSITE_CHANGEME: update with the worker hosts
|
||||
- stl3r01s06
|
||||
- stl3r01s02
|
||||
- eric01
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ metadata:
|
|||
spec:
|
||||
clusterName: target-cluster
|
||||
## NEWSITE_CHANGEME: update the below with the total number of worker nodes
|
||||
replicas: 2
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
cluster.x-k8s.io/cluster-name: target-cluster
|
||||
|
|
|
|||
|
|
@ -9,4 +9,3 @@ resources:
|
|||
patchesStrategicMerge:
|
||||
- versions-airshipctl.yaml
|
||||
- networking.yaml
|
||||
- networking-ha.yaml
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ../../../../function/k8scontrol-ha
|
||||
- ../../../../function/k8scontrol-oidc
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||
kind: Kustomization
|
||||
resources:
|
||||
- ../../../../../function/k8scontrol-ha/replacements
|
||||
- ../../../../../function/k8scontrol-oidc/replacements
|
||||
|
|
|
|||
|
|
@ -5,3 +5,4 @@ resources:
|
|||
- ../../../../function/treasuremap-base-catalogues
|
||||
- subcluster-networking.yaml
|
||||
- vm-networking.yaml
|
||||
- networking-ha.yaml
|
||||
|
|
|
|||
|
|
@ -26,3 +26,4 @@ vrrp:
|
|||
- 10250
|
||||
- 10255
|
||||
- 10256
|
||||
|
||||
Loading…
Reference in New Issue