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

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.
replicatedhq · Jun 28, 2024 · 43c8609 · 43c8609
1 parent 829de6e
commit 43c8609
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 23 deletions.
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
 }