Undercloud/undercloud-infrastructure
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUIv6

Browse Source
This commit is contained in:
Gitea Root Administrator
2025-08-21 21:04:30 +02:00
parent ed68547cca
commit addb22bfcc
12 changed files with 194 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
argocd/service.yaml
View File

@@ -5,9 +5,9 @@ metadata:
namespace: argocd
spec:
type: ClusterIP
clusterIP: fd00:0:0:f:1::81
clusterIP: 2001:470:7116:f:1::81
clusterIPs:
- fd00:0:0:f:1::81
- 2001:470:7116:f:1::81
- 10.0.91.81
ipFamilies:
- IPv6

81
calico-config/calico-peer.yaml
View File

@@ -8,49 +8,50 @@ spec:
nodeToNodeMeshEnabled: false
asNumber: 65000
serviceClusterIPs:
- cidr: "fd00:0:0:f:1::/108" #server service net
- cidr: "fd00:0:0:f:2::/108" #dmz service net
- cidr: "2001:470:7116:f:1::/108" #server service net
- cidr: "2001:470:7116:f:2::/108" #dmz service net
#- cidr: "fd00:0:0:f:1::/108" #server service net
#- cidr: "fd00:0:0:f:2::/108" #dmz service net
#- cidr: "fd00:0:0:a::/108" #server service net
- cidr: "10.0.91.0/24" #server service net
- cidr: "10.0.92.0/24" #dmz service net
#- cidr: "2001:470:72f0:f:1::/108" #server service net
##- cidr: "2001:470:72f0:f:2::/108" #dmz service net
---
apiVersion: projectcalico.org/v3
kind: BGPPeer
metadata:
name: "bgp-router1-v6"
spec:
peerIP: "fd00:0:0:2::88" #aux1 - bgp router...
asNumber: 65000
nextHopMode: "Self"
sourceAddress: "UseNodeIP"
---
apiVersion: projectcalico.org/v3
kind: BGPPeer
metadata:
name: "bgp-router1-v4"
spec:
peerIP: "10.0.2.88" #aux2 - bgp router...
asNumber: 65000
---
apiVersion: projectcalico.org/v3
kind: BGPPeer
metadata:
name: "bgp-router2-v6"
spec:
peerIP: "fd00:0:0:2::89" #aux1 - bgp router...
asNumber: 65000
nextHopMode: "Self"
sourceAddress: "UseNodeIP"
---
apiVersion: projectcalico.org/v3
kind: BGPPeer
metadata:
name: "bgp-router2-v4"
spec:
peerIP: "10.0.2.89" #aux2 - bgp router...
asNumber: 65000
---
#apiVersion: projectcalico.org/v3
#kind: BGPPeer
#metadata:
# name: "bgp-router1-v6"
#spec:
# peerIP: "fd00:0:0:2::88" #aux1 - bgp router...
# asNumber: 65000
# nextHopMode: "Self"
# sourceAddress: "UseNodeIP"
#---
#apiVersion: projectcalico.org/v3
#kind: BGPPeer
#metadata:
# name: "bgp-router1-v4"
#spec:
# peerIP: "10.0.2.88" #aux2 - bgp router...
# asNumber: 65000
#---
#apiVersion: projectcalico.org/v3
#kind: BGPPeer
#metadata:
# name: "bgp-router2-v6"
#spec:
# peerIP: "fd00:0:0:2::89" #aux1 - bgp router...
# asNumber: 65000
# nextHopMode: "Self"
# sourceAddress: "UseNodeIP"
#---
#apiVersion: projectcalico.org/v3
#kind: BGPPeer
#metadata:
# name: "bgp-router2-v4"
#spec:
# peerIP: "10.0.2.89" #aux2 - bgp router...
# asNumber: 65000
#---
apiVersion: projectcalico.org/v3
kind: BGPPeer
metadata:

4
calico-config/calico.yaml
View File

@@ -9,10 +9,10 @@ spec:
interface: eth.*
nodeAddressAutodetectionV6:
cidrs:
- "fd00:0:0:2::/64"
- "2001:470:7116:2::/64"
ipPools:
- blockSize: 122
cidr: fd00:0:0:a::/64
cidr: 2001:470:7116:a::/64
encapsulation: "VXLAN"
natOutgoing: Enabled
nodeSelector: all()

2
calico-config/custom-resources.yaml
View File

@@ -9,7 +9,7 @@ spec:
calicoNetwork:
ipPools:
- blockSize: 122
cidr: fd00:0:0:a::/64
cidr: 2001:470:7116:a::/64
encapsulation: VXLAN
natOutgoing: Disabled
nodeSelector: all()

42
calico-config/ippools.yaml
View File

@@ -3,14 +3,14 @@ kind: IPPool
metadata:
name: ipv6-server-private # server net
spec:
# blockSize: 122
# cidr: fd00:0:0:a::/64
# ipipMode: Never
# natOutgoing: false
# #disabled: false
# nodeSelector: all()
# vxlanMode: Always
#---
blockSize: 122
cidr: fd00:0:0:a::/64
ipipMode: Never
#natOutgoing: false
#disabled: false
nodeSelector: all()
vxlanMode: Always
---
apiVersion: projectcalico.org/v3
kind: IPPool
metadata:
@@ -23,16 +23,16 @@ spec:
#disabled: false
nodeSelector: all()
vxlanMode: Always
#---
#apiVersion: projectcalico.org/v3
#kind: IPPool
#metadata:
# name: ipv6-dmz-public # dmz net
#spec:
# blockSize: 122
# cidr: 2001:470:72f0:b::/64
# ipipMode: Never
# #natOutgoing: false
# #disabled: false
# nodeSelector: all()
# vxlanMode: Always
---
apiVersion: projectcalico.org/v3
kind: IPPool
metadata:
name: ipv6-dmz-public # dmz net
spec:
blockSize: 122
cidr: 2001:470:7116:b::/64
ipipMode: Never
#natOutgoing: false
#disabled: false
nodeSelector: all()
vxlanMode: Always

4
calico-config/whisker.yaml
View File

@@ -5,9 +5,9 @@ metadata:
namespace: calico-system
spec:
type: ClusterIP
clusterIP: fd00:0:0:f:1::82
clusterIP: 2001:470:7116:f:1::82
clusterIPs:
- fd00:0:0:f:1::82
- 2001:470:7116:f:1::82
- 10.0.91.82
ipFamilies:
- IPv6

26
terraform/control-plane1.bu
View File

@@ -37,7 +37,8 @@ storage:
[Network]
Address=fd00:0:0:2::91/64
Gateway=fd00:0:0:2::3
Address=2001:470:7116:2::91/64
Gateway=2001:470:7116:2::1
DNS=fd00:0:0:1::1
Address=10.0.2.91/24
Gateway=10.0.2.3
@@ -53,12 +54,21 @@ storage:
inline: |
127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback
2001:470:7116:2::91 control-plane1.undercloud.local control-plane1
2001:470:7116:2::92 control-plane2.undercloud.local control-plane2
2001:470:7116:2::93 control-plane3.undercloud.local control-plane3
2001:470:7116:2::101 worker1.undercloud.local worker1
2001:470:7116:2::102 worker2.undercloud.local worker2
2001:470:7116:2::103 worker3.undercloud.local worker3
fd00:0:0:2::91 control-plane1.undercloud.local control-plane1
fd00:0:0:2::92 control-plane2.undercloud.local control-plane2
fd00:0:0:2::93 control-plane3.undercloud.local control-plane3
fd00:0:0:2::101 worker1.undercloud.local worker1
fd00:0:0:2::102 worker2.undercloud.local worker2
fd00:0:0:2::103 worker3.undercloud.local worker3
10.0.2.91 control-plane1.undercloud.local control-plane1
10.0.2.92 control-plane2.undercloud.local control-plane2
10.0.2.93 control-plane3.undercloud.local control-plane3
@@ -155,11 +165,11 @@ storage:
name: control-plane1
criSocket: unix:///run/containerd/containerd.sock
kubeletExtraArgs:
node-ip: "fd00:0:0:2::91"
cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
node-ip: "2001:470:7116:2::91"
cluster-dns: "10.0.91.53,2001:470:7116:f:1::53"
volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
localAPIEndpoint:
advertiseAddress: "fd00:0:0:2::91"
advertiseAddress: "2001:470:7116:2::91"
bindPort: 6443
certificateKey: "fee7c3e5cfcac7e4774c6efca0464a42d897f30f7300340d6578b5cfb4a3d34b"
---
@@ -167,8 +177,8 @@ storage:
kind: ClusterConfiguration
controlPlaneEndpoint: "[fd00:0:0:2::100]:6443"
networking:
podSubnet: "fd00:0:0:a::/64,10.0.10.0/24"
serviceSubnet: "fd00:0:0:f:1::/108,10.0.91.0/24"
podSubnet: "2001:470:7116:a::/64,10.0.10.0/24"
serviceSubnet: "2001:470:7116:f:1::/108,10.0.91.0/24"
dnsDomain: "k8s.undercloud.local"
controllerManager:
extraArgs:
@@ -197,9 +207,9 @@ storage:
type: ClusterIP
ipFamilyPolicy: RequireDualStack
ipFamilies: [IPv6, IPv4]
clusterIP: fd00:0:0:f:1::53
clusterIP: 2001:470:7116:f:1::53
clusterIPs:
- fd00:0:0:f:1::53
- 2001:470:7116:f:1::53
- 10.0.91.53
ports:
- name: dns

18
terraform/control-plane2.bu
View File

@@ -31,7 +31,8 @@ storage:
[Network]
Address=fd00:0:0:2::92/64
Gateway=fd00:0:0:2::3
Address=2001:470:7116:2::92/64
Gateway=2001:470:7116:2::1
DNS=fd00:0:0:1::1
Address=10.0.2.92/24
Gateway=10.0.2.3
@@ -47,12 +48,21 @@ storage:
inline: |
127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback
2001:470:7116:2::91 control-plane1.undercloud.local control-plane1
2001:470:7116:2::92 control-plane2.undercloud.local control-plane2
2001:470:7116:2::93 control-plane3.undercloud.local control-plane3
2001:470:7116:2::101 worker1.undercloud.local worker1
2001:470:7116:2::102 worker2.undercloud.local worker2
2001:470:7116:2::103 worker3.undercloud.local worker3
fd00:0:0:2::91 control-plane1.undercloud.local control-plane1
fd00:0:0:2::92 control-plane2.undercloud.local control-plane2
fd00:0:0:2::93 control-plane3.undercloud.local control-plane3
fd00:0:0:2::101 worker1.undercloud.local worker1
fd00:0:0:2::102 worker2.undercloud.local worker2
fd00:0:0:2::103 worker3.undercloud.local worker3
10.0.2.91 control-plane1.undercloud.local control-plane1
10.0.2.92 control-plane2.undercloud.local control-plane2
10.0.2.93 control-plane3.undercloud.local control-plane3
@@ -145,8 +155,8 @@ storage:
name: control-plane2
criSocket: unix:///run/containerd/containerd.sock
kubeletExtraArgs:
node-ip: "fd00:0:0:2::92"
cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
node-ip: "2001:470:7116:2::92"
cluster-dns: "10.0.91.53,2001:470:7116:f:1::53"
volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
discovery:
bootstrapToken:
@@ -160,7 +170,7 @@ storage:
healthzBindAddress: "::"
clusterDomain: "k8s.undercloud.local"
clusterDNS:
- "2001:470:72f0:f:1::53"
- "2001:470:7116:f:1::53"
- "10.0.91.53"
cgroupDriver: "systemd"
volumePluginDir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"

20
terraform/control-plane3.bu
View File

@@ -31,7 +31,8 @@ storage:
[Network]
Address=fd00:0:0:2::93/64
Gateway=fd00:0:0:2::3
Address=2001:470:7116:2::93/64
Gateway=2001:470:7116:2::1
DNS=fd00:0:0:1::1
Address=10.0.2.93/24
Gateway=10.0.2.3
@@ -47,12 +48,21 @@ storage:
inline: |
127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback
2001:470:7116:2::91 control-plane1.undercloud.local control-plane1
2001:470:7116:2::92 control-plane2.undercloud.local control-plane2
2001:470:7116:2::93 control-plane3.undercloud.local control-plane3
2001:470:7116:2::101 worker1.undercloud.local worker1
2001:470:7116:2::102 worker2.undercloud.local worker2
2001:470:7116:2::103 worker3.undercloud.local worker3
fd00:0:0:2::91 control-plane1.undercloud.local control-plane1
fd00:0:0:2::92 control-plane2.undercloud.local control-plane2
fd00:0:0:2::93 control-plane3.undercloud.local control-plane3
fd00:0:0:2::101 worker1.undercloud.local worker1
fd00:0:0:2::102 worker2.undercloud.local worker2
fd00:0:0:2::103 worker3.undercloud.local worker3
10.0.2.91 control-plane1.undercloud.local control-plane1
10.0.2.92 control-plane2.undercloud.local control-plane2
10.0.2.93 control-plane3.undercloud.local control-plane3
@@ -138,15 +148,15 @@ storage:
kind: JoinConfiguration
controlPlane:
localAPIEndpoint:
advertiseAddress: "fd00:0:0:2::93"
advertiseAddress: "2001:470:7116:2::93"
bindPort: 6443
certificateKey: "fee7c3e5cfcac7e4774c6efca0464a42d897f30f7300340d6578b5cfb4a3d34b"
nodeRegistration:
name: control-plane3
criSocket: unix:///run/containerd/containerd.sock
kubeletExtraArgs:
node-ip: "fd00:0:0:2::93"
cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
node-ip: "2001:470:7116:2::93"
cluster-dns: "10.0.91.53,2001:470:7116:f:1::53"
volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
discovery:
bootstrapToken:
@@ -160,7 +170,7 @@ storage:
healthzBindAddress: "::"
clusterDomain: "k8s.undercloud.local"
clusterDNS:
- "2001:470:72f0:f:1::53"
- "2001:470:7116:f:1::53"
- "10.0.91.53"
cgroupDriver: "systemd"
volumePluginDir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"

18
terraform/worker1.bu
View File

@@ -31,7 +31,8 @@ storage:
[Network]
Address=fd00:0:0:2::101/64
Gateway=fd00:0:0:2::3
Address=2001:470:7116:2::101/64
Gateway=2001:470:7116:2::1
DNS=fd00:0:0:1::1
Address=10.0.2.101/24
Gateway=10.0.2.3
@@ -47,12 +48,21 @@ storage:
inline: |
127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback
2001:470:7116:2::91 control-plane1.undercloud.local control-plane1
2001:470:7116:2::92 control-plane2.undercloud.local control-plane2
2001:470:7116:2::93 control-plane3.undercloud.local control-plane3
2001:470:7116:2::101 worker1.undercloud.local worker1
2001:470:7116:2::102 worker2.undercloud.local worker2
2001:470:7116:2::103 worker3.undercloud.local worker3
fd00:0:0:2::91 control-plane1.undercloud.local control-plane1
fd00:0:0:2::92 control-plane2.undercloud.local control-plane2
fd00:0:0:2::93 control-plane3.undercloud.local control-plane3
fd00:0:0:2::101 worker1.undercloud.local worker1
fd00:0:0:2::102 worker2.undercloud.local worker2
fd00:0:0:2::103 worker3.undercloud.local worker3
10.0.2.91 control-plane1.undercloud.local control-plane1
10.0.2.92 control-plane2.undercloud.local control-plane2
10.0.2.93 control-plane3.undercloud.local control-plane3
@@ -136,8 +146,8 @@ storage:
name: worker1
criSocket: unix:///run/containerd/containerd.sock
kubeletExtraArgs:
node-ip: "fd00:0:0:2::101"
cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
node-ip: "2001:470:7116:2::101"
cluster-dns: "10.0.91.53,2001:470:7116:f:1::53"
volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
discovery:
bootstrapToken:
@@ -151,7 +161,7 @@ storage:
healthzBindAddress: "::"
clusterDomain: "k8s.undercloud.local"
clusterDNS:
- "2001:470:72f0:f:1::53"
- "2001:470:7116:f:1::53"
- "10.0.91.53"
cgroupDriver: "systemd"
volumePluginDir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"

18
terraform/worker2.bu
View File

@@ -31,7 +31,8 @@ storage:
[Network]
Address=fd00:0:0:2::102/64
Gateway=fd00:0:0:2::3
Address=2001:470:7116:2::102/64
Gateway=2001:470:7116:2::1
DNS=fd00:0:0:1::1
Address=10.0.2.102/24
Gateway=10.0.2.3
@@ -47,12 +48,21 @@ storage:
inline: |
127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback
2001:470:7116:2::91 control-plane1.undercloud.local control-plane1
2001:470:7116:2::92 control-plane2.undercloud.local control-plane2
2001:470:7116:2::93 control-plane3.undercloud.local control-plane3
2001:470:7116:2::101 worker1.undercloud.local worker1
2001:470:7116:2::102 worker2.undercloud.local worker2
2001:470:7116:2::103 worker3.undercloud.local worker3
fd00:0:0:2::91 control-plane1.undercloud.local control-plane1
fd00:0:0:2::92 control-plane2.undercloud.local control-plane2
fd00:0:0:2::93 control-plane3.undercloud.local control-plane3
fd00:0:0:2::101 worker1.undercloud.local worker1
fd00:0:0:2::102 worker2.undercloud.local worker2
fd00:0:0:2::103 worker3.undercloud.local worker3
10.0.2.91 control-plane1.undercloud.local control-plane1
10.0.2.92 control-plane2.undercloud.local control-plane2
10.0.2.93 control-plane3.undercloud.local control-plane3
@@ -136,8 +146,8 @@ storage:
name: worker2
criSocket: unix:///run/containerd/containerd.sock
kubeletExtraArgs:
node-ip: "fd00:0:0:2::102"
cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
node-ip: "2001:470:7116:2::102"
cluster-dns: "10.0.91.53,2001:470:7116:f:1::53"
volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
discovery:
bootstrapToken:
@@ -151,7 +161,7 @@ storage:
healthzBindAddress: "::"
clusterDomain: "k8s.undercloud.local"
clusterDNS:
- "2001:470:72f0:f:1::53"
- "2001:470:7116:f:1::53"
- "10.0.91.53"
cgroupDriver: "systemd"
volumePluginDir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"

18
terraform/worker3.bu
View File

@@ -31,7 +31,8 @@ storage:
[Network]
Address=fd00:0:0:2::103/64
Gateway=fd00:0:0:2::3
Address=2001:470:7116:2::103/64
Gateway=2001:470:7116:2::1
DNS=fd00:0:0:1::1
Address=10.0.2.103/24
Gateway=10.0.2.3
@@ -47,12 +48,21 @@ storage:
inline: |
127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback
2001:470:7116:2::91 control-plane1.undercloud.local control-plane1
2001:470:7116:2::92 control-plane2.undercloud.local control-plane2
2001:470:7116:2::93 control-plane3.undercloud.local control-plane3
2001:470:7116:2::101 worker1.undercloud.local worker1
2001:470:7116:2::102 worker2.undercloud.local worker2
2001:470:7116:2::103 worker3.undercloud.local worker3
fd00:0:0:2::91 control-plane1.undercloud.local control-plane1
fd00:0:0:2::92 control-plane2.undercloud.local control-plane2
fd00:0:0:2::93 control-plane3.undercloud.local control-plane3
fd00:0:0:2::101 worker1.undercloud.local worker1
fd00:0:0:2::102 worker2.undercloud.local worker2
fd00:0:0:2::103 worker3.undercloud.local worker3
10.0.2.91 control-plane1.undercloud.local control-plane1
10.0.2.92 control-plane2.undercloud.local control-plane2
10.0.2.93 control-plane3.undercloud.local control-plane3
@@ -136,8 +146,8 @@ storage:
name: worker3
criSocket: unix:///run/containerd/containerd.sock
kubeletExtraArgs:
node-ip: "fd00:0:0:2::103"
cluster-dns: "10.0.91.53,fd00:0:0:f:1::53"
node-ip: "2001:470:7116:2::103"
cluster-dns: "10.0.91.53,2001:470:7116:f:1::53"
volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
discovery:
bootstrapToken:
@@ -151,7 +161,7 @@ storage:
healthzBindAddress: "::"
clusterDomain: "k8s.undercloud.local"
clusterDNS:
- "2001:470:72f0:f:1::53"
- "2001:470:7116:f:1::53"
- "10.0.91.53"
cgroupDriver: "systemd"
volumePluginDir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"