Bump kubespray version to v2.27.0

electrocucaracha · Jan 9, 2025 · 93c009a · 93c009a
1 parent 0180aa7
commit 93c009a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -135,7 +135,7 @@ _v1.18.10_ using the Kubespray version _v2.14.2_:
 | KRD_ANSIBLE_DEBUG                     | false                                          | Enables ansible verbose execution                                               |
 | PKG_DEBUG                             | false                                          | Enables cURL package installer verbose execution                                |
 | KRD_KUBE_VERSION                      | v1.30.4                                        | Specifies the Kubernetes version to be upgraded                                 |
-| KRD_KUBESPRAY_VERSION                 | v2.26.0                                        | Specifies the Kubespray version to be used during the upgrade process           |
+| KRD_KUBESPRAY_VERSION                 | v2.27.0                                        | Specifies the Kubespray version to be used during the upgrade process           |
 | KRD_KUBESPRAY_REPO                    | `https://github.com/kubernetes-sigs/kubespray` | Specifies the Git repository to fetch the Kubespray's source code               |
 | KRD_ENABLE_TESTS                      | false                                          | Enables the functional tests during the deployment process                      |
 | KRD_HELM_CHART                        |                                                | Specifies the Helm chart to be installed                                        |

diff --git a/Vagrantfile b/Vagrantfile
@@ -43,7 +43,7 @@ File.open("#{File.dirname(__FILE__)}/inventory/hosts.ini", "w") do |inventory_fi
       inventory_file.puts(node["name"]) if node["roles"].include?(group.to_s)
     end
   end
-  inventory_file.puts("\n[k8s-cluster:children]\nkube-node\nkube-master")
+  inventory_file.puts("\n[k8s_cluster:children]\nkube-node\nkube-master")
 end
 
 system("echo -e \"\n\n\n\" | ssh-keygen -f #{File.dirname(__FILE__)}/insecure_keys/key -t rsa -N ''") unless File.exist?("#{File.dirname(__FILE__)}/insecure_keys/key")

diff --git a/_commons.sh b/_commons.sh
@@ -72,9 +72,11 @@ function _install_kubespray {
         pushd "$kubespray_folder"
         if [ "$kubespray_version" != "master" ]; then
             git checkout -b "${kubespray_version#"origin/"}" "$kubespray_version"
+            if _vercmp "${kubespray_version#*v}" '<' "2.27"; then
+                # NOTE: https://github.com/kubernetes-sigs/kubespray/pull/11434/commits/3036d7ef28b837ce7209a7cd72293fbce54a280c
+                curl -fsSL "https://raw.githubusercontent.com/kubernetes-sigs/kubespray/refs/heads/master/roles/kubernetes-apps/network_plugin/multus/tasks/main.yml" --output "roles/kubernetes-apps/network_plugin/multus/tasks/main.yml"
+            fi
         fi
-        # TODO: Remove until this is merged (https://github.com/kubernetes-sigs/kubespray/pull/11434/commits/3036d7ef28b837ce7209a7cd72293fbce54a280c)
-        curl -fsSL "https://raw.githubusercontent.com/kubernetes-sigs/kubespray/refs/heads/master/roles/kubernetes-apps/network_plugin/multus/tasks/main.yml" --output "roles/kubernetes-apps/network_plugin/multus/tasks/main.yml"
 
         curl -fsSL http://bit.ly/install_pkg | PKG_COMMANDS_LIST="pip" bash
         PIP_CMD="sudo -E $(command -v pip)"

diff --git a/ci/check.sh b/ci/check.sh
@@ -56,7 +56,7 @@ function _run_assertions {
         assert_contains "$(command -v kubectl)" "kubectl"
         assert_are_equal "${KRD_KUBE_VERSION:-v1.30.4}" "$(kubectl version -o yaml | grep gitVersion | awk 'FNR==2{ print $2}')"
         pushd /opt/kubespray >/dev/null
-        assert_are_equal "${KRD_KUBESPRAY_VERSION:-v2.26.0}" "$(git describe --abbrev=0 --tags)"
+        assert_are_equal "${KRD_KUBESPRAY_VERSION:-v2.27.0}" "$(git describe --abbrev=0 --tags)"
         popd >/dev/null
     else
         assert_contains "$($VAGRANT_CMD_SSH_INSTALLER "command -v kubectl")" "kubectl"

diff --git a/kubespray_images.tpl b/kubespray_images.tpl
@@ -1,12 +1,12 @@
 registry.k8s.io/coredns/coredns:v1.8.6
 registry.k8s.io/cpa/cluster-proportional-autoscaler-amd64:1.8.5
 registry.k8s.io/dns/k8s-dns-node-cache:1.22.28
-registry.k8s.io/ingress-nginx/controller:v1.11.2
+registry.k8s.io/ingress-nginx/controller:v1.12.0
 registry.k8s.io/kube-apiserver:$kube_version
 registry.k8s.io/kube-controller-manager:$kube_version
 registry.k8s.io/kube-proxy:$kube_version
 registry.k8s.io/kube-scheduler:$kube_version
 registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
-quay.io/jetstack/cert-manager-cainjector:v1.14.7
-quay.io/jetstack/cert-manager-controller:v1.14.7
-quay.io/jetstack/cert-manager-webhook:v1.14.7
+quay.io/jetstack/cert-manager-cainjector:v1.15.3
+quay.io/jetstack/cert-manager-controller:v1.15.3
+quay.io/jetstack/cert-manager-webhook:v1.15.3
diff --git a/playbooks/krd-vars.yml b/playbooks/krd-vars.yml
@@ -9,7 +9,7 @@
 ##############################################################################
 kpt_version: 1.0.0-beta.55
 go_version: 1.15.3
-kubespray_version: v2.26.0
+kubespray_version: v2.27.0
 istio_version: 1.24.1
 cfssl_version: 1.6.5
 sonobuoy_version: 0.57.2