diff --git a/Kubernetes/RKE2-Cilium/rke2-cilium-config.yaml b/Kubernetes/RKE2-Cilium/rke2-cilium-config.yaml index e943105..866fd01 100644 --- a/Kubernetes/RKE2-Cilium/rke2-cilium-config.yaml +++ b/Kubernetes/RKE2-Cilium/rke2-cilium-config.yaml @@ -11,10 +11,11 @@ spec: k8sServicePort: 6443 cni: chainingMode: "none" -# Configure IPAM/PodCIDR -ipam: - mode: cluster-pool - operator: - clusterPoolIPv4PodCIDRList: - - "" - clusterPoolIPv4MaskSize: 27 + tunnelProtocol: "vxlan" + routingMode: "tunnel" + ipam: + mode: cluster-pool + operator: + clusterPoolIPv4PodCIDRList: + - "" + clusterPoolIPv4MaskSize: 27 diff --git a/Kubernetes/RKE2-Cilium/rke2.sh b/Kubernetes/RKE2-Cilium/rke2.sh index 9550eef..5dc4e87 100644 --- a/Kubernetes/RKE2-Cilium/rke2.sh +++ b/Kubernetes/RKE2-Cilium/rke2.sh @@ -132,9 +132,8 @@ mv config.yaml /etc/rancher/rke2/config.yaml echo 'export KUBECONFIG=/etc/rancher/rke2/rke2.yaml' >> ~/.bashrc ; echo 'export PATH=${PATH}:/var/lib/rancher/rke2/bin' >> ~/.bashrc ; echo 'alias k=kubectl' >> ~/.bashrc ; source ~/.bashrc ; curl -LJO https://raw.githubusercontent.com/JamesTurland/JimsGarage/main/Kubernetes/RKE2-Cilium/rke2-cilium-config.yaml -sudo cat rke2-cilium-config.yaml | sed 's//'$master1'/g' > rke2-cilium-config.yaml -sudo cat rke2-cilium-config.yaml | sed 's//'$lbrange'/g' > rke2-cilium-config.yaml -cp rke2-cilium-config.yaml /var/lib/rancher/rke2/server/manifests/rke2-cilium-config.yaml +cat rke2-cilium-config.yaml | sed 's//'$master1'/g' | sed 's//'$lbrange'/g' > rke2-cilium-config-update.yaml +cp rke2-cilium-config-update.yaml /var/lib/rancher/rke2/server/manifests/rke2-cilium-config.yaml curl -sfL https://get.rke2.io | sh - systemctl enable rke2-server.service @@ -175,8 +174,8 @@ for newnode in "${masters[@]}"; do echo "disable-kube-proxy: \"true\"" >> /etc/rancher/rke2/config.yaml curl -LJO https://raw.githubusercontent.com/JamesTurland/JimsGarage/main/Kubernetes/RKE2-Cilium/rke2-cilium-config.yaml - sudo cat rke2-cilium-config.yaml | sed 's//'$master1'/g' > /var/lib/rancher/rke2/server/manifests/rke2-cilium-config.yaml - sudo cat /var/lib/rancher/rke2/server/manifests/rke2-cilium-config.yaml | sed 's//'$lbrange'/g' > /var/lib/rancher/rke2/server/manifests/rke2-cilium-config.yaml + cat rke2-cilium-config.yaml | sed 's//'$master1'/g' | sed 's//'$lbrange'/g' > rke2-cilium-config-update.yaml + cp rke2-cilium-config-update.yaml /var/lib/rancher/rke2/server/manifests/rke2-cilium-config.yaml curl -sfL https://get.rke2.io | sh - systemctl enable rke2-server.service