Use cluster-cidr from kube-controller-manager.yaml (#5248)

hedge-sparrow · web-flow · commit 43c8609932a7 · 2024-06-28T14:49:34.000+01:00
Instead of using the in-cluster kubeadm config which sometimes? loses
the configured podSubnet, instead pull the podSubnet from the
kube-controller-manager static manifest. this should prevent an issue
where kurl sometimes resets the podSubnet on upgrade.
diff --git a/addons/flannel/0.20.0/install.sh b/addons/flannel/0.20.0/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.20.1/install.sh b/addons/flannel/0.20.1/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.20.2/install.sh b/addons/flannel/0.20.2/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.21.0/install.sh b/addons/flannel/0.21.0/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.21.1/install.sh b/addons/flannel/0.21.1/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.21.2/install.sh b/addons/flannel/0.21.2/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.21.3/install.sh b/addons/flannel/0.21.3/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.21.4/install.sh b/addons/flannel/0.21.4/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.21.5/install.sh b/addons/flannel/0.21.5/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.22.0/install.sh b/addons/flannel/0.22.0/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.22.1/install.sh b/addons/flannel/0.22.1/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.22.2/install.sh b/addons/flannel/0.22.2/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.22.3/install.sh b/addons/flannel/0.22.3/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.23.0/install.sh b/addons/flannel/0.23.0/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.24.0/install.sh b/addons/flannel/0.24.0/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.24.1/install.sh b/addons/flannel/0.24.1/install.sh
@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.24.2/install.sh b/addons/flannel/0.24.2/install.sh
@@ -195,7 +195,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.24.4/install.sh b/addons/flannel/0.24.4/install.sh
@@ -194,7 +194,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.25.1/install.sh b/addons/flannel/0.25.1/install.sh
@@ -194,7 +194,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.25.2/install.sh b/addons/flannel/0.25.2/install.sh
@@ -194,7 +194,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.25.3/install.sh b/addons/flannel/0.25.3/install.sh
@@ -194,7 +194,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/0.25.4/install.sh b/addons/flannel/0.25.4/install.sh
@@ -194,7 +194,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 
diff --git a/addons/flannel/template/base/install.sh b/addons/flannel/template/base/install.sh
@@ -194,7 +194,7 @@ function flannel_init_pod_subnet() {
     cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"
 
     if commandExists kubectl; then
-        EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null | grep podSubnet | awk '{ print $NF }')
+        EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)
     fi
 }
 

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ function flannel_init_pod_subnet() {`
`162`	`162`	`cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"`
`163`	`163`
`164`	`164`	`if commandExists kubectl; then`
`165`		`- EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null \| grep podSubnet \| awk '{ print $NF }')`
	`165`	`+ EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)`
`166`	`166`	`fi`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ function flannel_init_pod_subnet() {`
`195`	`195`	`cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"`
`196`	`196`
`197`	`197`	`if commandExists kubectl; then`
`198`		`- EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null \| grep podSubnet \| awk '{ print $NF }')`
	`198`	`+ EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)`
`199`	`199`	`fi`
`200`	`200`	`}`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ function flannel_init_pod_subnet() {`
`194`	`194`	`cp "$src/kubeadm.yaml" "$DIR/kustomize/kubeadm/init-patches/flannel.yaml"`
`195`	`195`
`196`	`196`	`if commandExists kubectl; then`
`197`		`- EXISTING_POD_CIDR=$(kubectl -n kube-system get cm kubeadm-config -oyaml 2>/dev/null \| grep podSubnet \| awk '{ print $NF }')`
	`197`	`+ EXISTING_POD_CIDR=$(awk -F '=' '/--cluster-cidr/{print $2}' /etc/kubernetes/manifests/kube-controller-manager.yaml 2>/dev/null)`
`198`	`198`	`fi`
`199`	`199`	`}`
`200`	`200`