From f6e24d51945272a6aa59f83df6a08b7435a64a90 Mon Sep 17 00:00:00 2001 From: Rahul Sharma Date: Wed, 28 Feb 2024 16:05:25 -0500 Subject: [PATCH] set ipam mode to kubernetes, change cidr for pod ip's (#147) Co-authored-by: Rahul Sharma --- docs/src/flavors/clusterclass-kubeadm.md | 2 +- templates/addons/cilium/cilium.yaml | 4 ++++ templates/flavors/base/cluster.yaml | 2 +- templates/flavors/clusterclass-kubeadm/cluster-template.yaml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/src/flavors/clusterclass-kubeadm.md b/docs/src/flavors/clusterclass-kubeadm.md index 1207af2b5..bd77c3295 100644 --- a/docs/src/flavors/clusterclass-kubeadm.md +++ b/docs/src/flavors/clusterclass-kubeadm.md @@ -34,7 +34,7 @@ clusterNetwork: pods: cidrBlocks: - - 192.168.128.0/17 + - 10.192.0.0/10 topology: class: kubeadm controlPlane: diff --git a/templates/addons/cilium/cilium.yaml b/templates/addons/cilium/cilium.yaml index 5eb267d1d..5527f3a2c 100644 --- a/templates/addons/cilium/cilium.yaml +++ b/templates/addons/cilium/cilium.yaml @@ -15,6 +15,10 @@ spec: wait: true timeout: 5m valuesTemplate: | + ipam: + mode: kubernetes + k8s: + requireIPv4PodCIDR: true hubble: relay: enabled: true diff --git a/templates/flavors/base/cluster.yaml b/templates/flavors/base/cluster.yaml index c47d3f125..4a0791a6f 100644 --- a/templates/flavors/base/cluster.yaml +++ b/templates/flavors/base/cluster.yaml @@ -9,7 +9,7 @@ spec: clusterNetwork: pods: cidrBlocks: - - 192.168.128.0/17 + - 10.192.0.0/10 controlPlaneRef: apiVersion: controlplane.cluster.x-k8s.io/v1beta1 kind: REPLACEME diff --git a/templates/flavors/clusterclass-kubeadm/cluster-template.yaml b/templates/flavors/clusterclass-kubeadm/cluster-template.yaml index 4aef17cef..64bea6b02 100644 --- a/templates/flavors/clusterclass-kubeadm/cluster-template.yaml +++ b/templates/flavors/clusterclass-kubeadm/cluster-template.yaml @@ -10,7 +10,7 @@ spec: clusterNetwork: pods: cidrBlocks: - - 192.168.128.0/17 + - 10.192.0.0/10 topology: class: kubeadm version: ${KUBERNETES_VERSION}