Fix create_stack for version 1.25

kubernetes 1.25 changed the key for the NoSchedule taint to 'control-plane'. Fix the script to handle both pre and post version 1.25 Signed-off-by: Peter W. Morreale <[email protected]>
clearlinux · Nov 15, 2022 · 9e36973 · 9e36973
1 parent af1171a
commit 9e36973
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/clr-k8s-examples/create_stack.sh b/clr-k8s-examples/create_stack.sh
@@ -115,9 +115,17 @@ function cluster_init() {
 		fi
 	fi
 
-	#Ensure single node k8s works
+	#Ensure single node k8s works both pre and post v1.25
 	if [ "$(kubectl get nodes | wc -l)" -eq 2 ]; then
-		kubectl taint nodes --all node-role.kubernetes.io/master-
+		minor=$(kubeadm version -o short | cut -f 2 -d "." )
+		if [ $minor -ge "25" ]; then
+			kubectl taint nodes --all  node-role.kubernetes.io/control-plane-
+		elif [ $minor -eq "24" ]; then
+			kubectl taint nodes --all  node-role.kubernetes.io/control-plane-
+			kubectl taint nodes --all  node-role.kubernetes.io/master-
+		else
+			kubectl taint nodes --all  node-role.kubernetes.io/master-
+		fi
 		mode="standalone"
 	fi
 }