Skip kube-vip-prepare for 1.31+ k8s since CAPI won't depend on super-…

…admin.conf Signed-off-by: Lubron Zhan <[email protected]>
kubernetes-sigs · Aug 23, 2024 · e1ef4d7 · e1ef4d7
1 parent 75a5e72
commit e1ef4d7
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 37 deletions.
diff --git a/internal/kubevip/kube-vip-prepare.sh b/internal/kubevip/kube-vip-prepare.sh
@@ -19,9 +19,9 @@ set -e
 # Configure the workaround required for kubeadm init with kube-vip:
 # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-# Nothing to do for kubernetes < v1.29
+# Nothing to do for kubernetes < v1.29 or >= v1.31.
 KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
   exit 0
 fi
 

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -175,9 +175,9 @@ spec:
         # Configure the workaround required for kubeadm init with kube-vip:
         # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-        # Nothing to do for kubernetes < v1.29
+        # Nothing to do for kubernetes < v1.29 or >= v1.31.
         KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-        if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+        if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
           exit 0
         fi
 
@@ -1582,4 +1582,4 @@ data:
 kind: ConfigMap
 metadata:
   name: cpi-manifests
-  namespace: '${NAMESPACE}'
+  namespace: '${NAMESPACE}'
diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -212,9 +212,9 @@ spec:
         # Configure the workaround required for kubeadm init with kube-vip:
         # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-        # Nothing to do for kubernetes < v1.29
+        # Nothing to do for kubernetes < v1.29 or >= v1.31.
         KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-        if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+        if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
           exit 0
         fi
 
@@ -1497,4 +1497,4 @@ data:
 kind: ConfigMap
 metadata:
   name: cpi-manifests
-  namespace: '${NAMESPACE}'
+  namespace: '${NAMESPACE}'
diff --git a/templates/cluster-template-supervisor.yaml b/templates/cluster-template-supervisor.yaml
@@ -169,9 +169,9 @@ spec:
         # Configure the workaround required for kubeadm init with kube-vip:
         # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-        # Nothing to do for kubernetes < v1.29
+        # Nothing to do for kubernetes < v1.29 or >= v1.31.
         KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-        if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+        if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
           exit 0
         fi
 
@@ -1447,4 +1447,4 @@ data:
 kind: ConfigMap
 metadata:
   name: cpi-manifests
-  namespace: '${NAMESPACE}'
+  namespace: '${NAMESPACE}'
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -202,9 +202,9 @@ spec:
         # Configure the workaround required for kubeadm init with kube-vip:
         # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-        # Nothing to do for kubernetes < v1.29
+        # Nothing to do for kubernetes < v1.29 or >= v1.31.
         KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-        if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+        if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
           exit 0
         fi
 
@@ -1487,4 +1487,4 @@ data:
 kind: ConfigMap
 metadata:
   name: cpi-manifests
-  namespace: '${NAMESPACE}'
+  namespace: '${NAMESPACE}'
diff --git a/templates/clusterclass-template-supervisor.yaml b/templates/clusterclass-template-supervisor.yaml
@@ -150,9 +150,9 @@ spec:
               # Configure the workaround required for kubeadm init with kube-vip:
               # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-              # Nothing to do for kubernetes < v1.29
+              # Nothing to do for kubernetes < v1.29 or >= v1.31.
               KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-              if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+              if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
                 exit 0
               fi
 
@@ -321,4 +321,4 @@ spec:
         localhost.localdomain localhost4 localhost4.localdomain4" >>/etc/hosts
       - mkdir -p /etc/pre-kubeadm-commands
       - for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
-        do echo "Running script $script"; "$script"; done
+        do echo "Running script $script"; "$script"; done
diff --git a/templates/clusterclass-template.yaml b/templates/clusterclass-template.yaml
@@ -164,9 +164,9 @@ spec:
               # Configure the workaround required for kubeadm init with kube-vip:
               # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-              # Nothing to do for kubernetes < v1.29
+              # Nothing to do for kubernetes < v1.29 or >= v1.31.
               KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-              if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+              if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
                 exit 0
               fi
 
@@ -379,4 +379,4 @@ spec:
         localhost.localdomain localhost4 localhost4.localdomain4" >>/etc/hosts
       - mkdir -p /etc/pre-kubeadm-commands
       - for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
-        do echo "Running script $script"; "$script"; done
+        do echo "Running script $script"; "$script"; done
diff --git a/.../e2e/data/infrastructure-vsphere-govmomi/v1.10/clusterclass/clusterclass-quick-start.yaml b/.../e2e/data/infrastructure-vsphere-govmomi/v1.10/clusterclass/clusterclass-quick-start.yaml
@@ -165,9 +165,10 @@ spec:
               # Configure the workaround required for kubeadm init with kube-vip:
               # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-              # Nothing to do for kubernetes < v1.29
+              # Nothing to do for kubernetes < v1.29 or >= v1.31.
+
               KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-              if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+              if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
                 exit 0
               fi
 

diff --git a/.../e2e/data/infrastructure-vsphere-govmomi/v1.11/clusterclass/clusterclass-quick-start.yaml b/.../e2e/data/infrastructure-vsphere-govmomi/v1.11/clusterclass/clusterclass-quick-start.yaml
@@ -164,9 +164,9 @@ spec:
               # Configure the workaround required for kubeadm init with kube-vip:
               # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-              # Nothing to do for kubernetes < v1.29
+              # Nothing to do for kubernetes < v1.29 or >= v1.31.
               KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-              if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+              if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
                 exit 0
               fi
 
@@ -379,4 +379,4 @@ spec:
         localhost.localdomain localhost4 localhost4.localdomain4" >>/etc/hosts
       - mkdir -p /etc/pre-kubeadm-commands
       - for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
-        do echo "Running script $script"; "$script"; done
+        do echo "Running script $script"; "$script"; done
diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/clusterclass/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/v1.9/clusterclass/clusterclass-quick-start.yaml
@@ -165,10 +165,10 @@ spec:
               # Configure the workaround required for kubeadm init with kube-vip:
               # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-              # Nothing to do for kubernetes < v1.29
+              # Nothing to do for kubernetes < v1.29 or >= v1.31.
               KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-              if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
-                return
+              if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
+                exit 0
               fi
 
               IS_KUBEADM_INIT="false"

diff --git a/...astructure-vsphere-supervisor/v1.10/clusterclass/clusterclass-quick-start-supervisor.yaml b/...astructure-vsphere-supervisor/v1.10/clusterclass/clusterclass-quick-start-supervisor.yaml
@@ -150,9 +150,9 @@ spec:
               # Configure the workaround required for kubeadm init with kube-vip:
               # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-              # Nothing to do for kubernetes < v1.29
+              # Nothing to do for kubernetes < v1.29 or >= v1.31.
               KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-              if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+              if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
                 exit 0
               fi
 
@@ -321,4 +321,4 @@ spec:
         localhost.localdomain localhost4 localhost4.localdomain4" >>/etc/hosts
       - mkdir -p /etc/pre-kubeadm-commands
       - for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
-        do echo "Running script $script"; "$script"; done
+        do echo "Running script $script"; "$script"; done
diff --git a/...astructure-vsphere-supervisor/v1.11/clusterclass/clusterclass-quick-start-supervisor.yaml b/...astructure-vsphere-supervisor/v1.11/clusterclass/clusterclass-quick-start-supervisor.yaml
@@ -150,9 +150,9 @@ spec:
               # Configure the workaround required for kubeadm init with kube-vip:
               # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-              # Nothing to do for kubernetes < v1.29
+              # Nothing to do for kubernetes < v1.29 or >= v1.31.
               KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-              if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+              if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
                 exit 0
               fi
 
@@ -321,4 +321,4 @@ spec:
         localhost.localdomain localhost4 localhost4.localdomain4" >>/etc/hosts
       - mkdir -p /etc/pre-kubeadm-commands
       - for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
-        do echo "Running script $script"; "$script"; done
+        do echo "Running script $script"; "$script"; done
diff --git a/...rastructure-vsphere-supervisor/v1.9/clusterclass/clusterclass-quick-start-supervisor.yaml b/...rastructure-vsphere-supervisor/v1.9/clusterclass/clusterclass-quick-start-supervisor.yaml
@@ -150,9 +150,9 @@ spec:
               # Configure the workaround required for kubeadm init with kube-vip:
               # xref: https://github.com/kube-vip/kube-vip/issues/684
 
-              # Nothing to do for kubernetes < v1.29
+              # Nothing to do for kubernetes < v1.29 or >= v1.31.
               KUBEADM_MINOR="$(kubeadm version -o short | cut -d '.' -f 2)"
-              if [[ "$KUBEADM_MINOR" -lt "29" ]]; then
+              if [[ "$KUBEADM_MINOR" -lt "29" ]] || [[ "$KUBEADM_MINOR" -gt "30" ]]; then
                 exit 0
               fi
 
@@ -321,4 +321,4 @@ spec:
         localhost.localdomain localhost4 localhost4.localdomain4" >>/etc/hosts
       - mkdir -p /etc/pre-kubeadm-commands
       - for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
-        do echo "Running script $script"; "$script"; done
+        do echo "Running script $script"; "$script"; done