Bump dependencies: CAPI, Rancher and K8s versions

Breakdown of version updates: - CAPI to v1.7.3 - Rancher to v2.9.0 - RKE2 to v1.30.3+rke2r1 - K8s to v1.30.x, rancher-agent v2.9.0 and cert-manager to newer version - Other 'Makefile' dependencies to newer version Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
rancher · Aug 14, 2024 · 8dfe168 · 8dfe168
1 parent c7850e2
commit 8dfe168
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 56 deletions.
diff --git a/.github/workflows/test_chart.yaml b/.github/workflows/test_chart.yaml
@@ -11,8 +11,8 @@ env:
   CONTROLLER_IMG: controller
   CONTROLLER_IMAGE_VERSION: v0.0.1
   PULL_POLICY: Never
-  CERT_MANAGER_VERSION: v1.12.3
-  RANCHER_VERSION: v2.8.2
+  CERT_MANAGER_VERSION: v1.15.2
+  RANCHER_VERSION: v2.9.0
 
 jobs:
   lint-test:
@@ -59,7 +59,7 @@ jobs:
         uses: helm/kind-action@v1.9.0
         with:
           cluster_name: kind
-          node_image: kindest/node:v1.26.3
+          node_image: kindest/node:v1.30.0
 
       - name: Add local docker image
         run: kind load docker-image ${{ env.MANIFEST_IMG }}:${{ env.TAG }}
@@ -68,13 +68,13 @@ jobs:
         run: helm repo add jetstack https://charts.jetstack.io
 
       - name: Add rancher chart repo
-        run: helm repo add rancher-stable https://releases.rancher.com/server-charts/stable
+        run: helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
 
       - name: Install cert-manager
         run: helm install cert-manager jetstack/cert-manager --namespace cert-manager --create-namespace --version ${{ env.CERT_MANAGER_VERSION }} --set installCRDs=true --wait
 
       - name: Install Rancher
-        run: helm install rancher rancher-stable/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --set global.cattle.psp.enabled=false --version ${{ env.RANCHER_VERSION }} --wait
+        run: helm install rancher rancher-latest/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --version ${{ env.RANCHER_VERSION }} --wait
 
       - name: Run chart-testing (install)
         run: helm install rancher-turtles out/charts/rancher-turtles/ -n rancher-turtles-system --create-namespace --wait --debug

diff --git a/Makefile b/Makefile
@@ -99,7 +99,7 @@ KUSTOMIZE_BIN := kustomize
 KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
 KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
 
-SETUP_ENVTEST_VER := v0.0.0-20211110210527-619e6b92dab9
+SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
 SETUP_ENVTEST_BIN := setup-envtest
 SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
 SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
@@ -109,7 +109,7 @@ CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))
 CONTROLLER_GEN_PKG := sigs.k8s.io/controller-tools/cmd/controller-gen
 
-CONVERSION_GEN_VER := v0.27.1
+CONVERSION_GEN_VER := v0.29.2
 CONVERSION_GEN_BIN := conversion-gen
 # We are intentionally using the binary without version suffix, to avoid the version
 # in generated files.
@@ -121,7 +121,7 @@ ENVSUBST_BIN := envsubst
 ENVSUBST := $(abspath $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)-$(ENVSUBST_VER))
 ENVSUBST_PKG := github.com/drone/envsubst/v2/cmd/envsubst
 
-GO_APIDIFF_VER := v0.6.0
+GO_APIDIFF_VER := v0.8.2
 GO_APIDIFF_BIN := go-apidiff
 GO_APIDIFF := $(abspath $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)-$(GO_APIDIFF_VER))
 GO_APIDIFF_PKG := github.com/joelanford/go-apidiff
@@ -131,11 +131,11 @@ GINGKO_VER := $(call get_go_version,github.com/onsi/ginkgo/v2)
 GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINGKO_VER))
 GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
 
-HELM_VER := v3.14.0
+HELM_VER := v3.15.3
 HELM_BIN := helm
 HELM := $(TOOLS_BIN_DIR)/$(HELM_BIN)-$(HELM_VER)
 
-CLUSTERCTL_VER := v1.4.6
+CLUSTERCTL_VER := v1.7.3
 CLUSTERCTL_BIN := clusterctl
 CLUSTERCTL := $(TOOLS_BIN_DIR)/$(CLUSTERCTL_BIN)-$(CLUSTERCTL_VER)
 

diff --git a/charts/rancher-turtles/templates/clusterctl-config.yaml b/charts/rancher-turtles/templates/clusterctl-config.yaml
@@ -9,7 +9,7 @@ data:
     providers:
     # Cluster API core provider
     - name:         "cluster-api"
-      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.4.6/core-components.yaml"
+      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.3/core-components.yaml"
       type:         "CoreProvider"
 
     # Infrastructure providers
@@ -20,7 +20,7 @@ data:
       url:          "https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/v1.16.0/infrastructure-components.yaml"
       type:         "InfrastructureProvider"
     - name:         "docker"
-      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.4.6/infrastructure-components-development.yaml"
+      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.3/infrastructure-components-development.yaml"
       type:         "InfrastructureProvider"
     - name:         "gcp"
       url:          "https://github.com/kubernetes-sigs/cluster-api-provider-gcp/releases/v1.7.0/infrastructure-components.yaml"
@@ -34,15 +34,15 @@ data:
 
     # Bootstrap providers
     - name:         "kubeadm"
-      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.4.6/bootstrap-components.yaml"
+      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.3/bootstrap-components.yaml"
       type:         "BootstrapProvider"
     - name:         "rke2"
       url:          "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.5.0/bootstrap-components.yaml"
       type:         "BootstrapProvider"
 
     # ControlPlane providers
     - name:         "kubeadm"
-      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.4.6/control-plane-components.yaml"
+      url:          "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.3/control-plane-components.yaml"
       type:         "ControlPlaneProvider"
     - name:         "rke2"
       url:          "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.5.0/control-plane-components.yaml"

diff --git a/exp/etcdrestore/go.mod b/exp/etcdrestore/go.mod
@@ -15,7 +15,7 @@ require (
 	k8s.io/client-go v0.29.4
 	k8s.io/component-base v0.29.4
 	k8s.io/klog/v2 v2.110.1
-	sigs.k8s.io/cluster-api v1.7.2
+	sigs.k8s.io/cluster-api v1.7.3
 	sigs.k8s.io/cluster-api-operator v0.12.0
 	sigs.k8s.io/controller-runtime v0.17.3
 )

diff --git a/exp/etcdrestore/go.sum b/exp/etcdrestore/go.sum
@@ -277,8 +277,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
 k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE=
-sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
+sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
+sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
 sigs.k8s.io/cluster-api-operator v0.12.0 h1:7EBStWwkvWg+yZW8Uq8XihmQdFXcEXZOEYfjqdJEN18=
 sigs.k8s.io/cluster-api-operator v0.12.0/go.mod h1:GcWnGrKz74LS/E0IuFcT6YHBtL7zR9DNqjyVezf72mk=
 sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=

diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	k8s.io/component-base v0.29.4
 	k8s.io/klog/v2 v2.110.1
 	k8s.io/utils v0.0.0-20231127182322-b307cd553661
-	sigs.k8s.io/cluster-api v1.7.1
+	sigs.k8s.io/cluster-api v1.7.3
 	sigs.k8s.io/cluster-api-operator v0.12.0
 	sigs.k8s.io/controller-runtime v0.17.3
 )

diff --git a/go.sum b/go.sum
@@ -238,8 +238,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
 k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
 k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY=
-sigs.k8s.io/cluster-api v1.7.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
+sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
+sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
 sigs.k8s.io/cluster-api-operator v0.12.0 h1:7EBStWwkvWg+yZW8Uq8XihmQdFXcEXZOEYfjqdJEN18=
 sigs.k8s.io/cluster-api-operator v0.12.0/go.mod h1:GcWnGrKz74LS/E0IuFcT6YHBtL7zR9DNqjyVezf72mk=
 sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=

diff --git a/hack/ensure-kubectl.sh b/hack/ensure-kubectl.sh
@@ -26,7 +26,7 @@ fi
 source "$(dirname "${BASH_SOURCE[0]}")/utils.sh"
 
 GOPATH_BIN="$(go env GOPATH)/bin/"
-MINIMUM_KUBECTL_VERSION=v1.27.0
+MINIMUM_KUBECTL_VERSION=v1.30.0
 goarch="$(go env GOARCH)"
 goos="$(go env GOOS)"
 

diff --git a/internal/controllers/testdata/import_sample.yaml b/internal/controllers/testdata/import_sample.yaml
@@ -192,7 +192,7 @@ spec:
             value: 726f86e0-b3bc-41f1-9757-8a0ee24560f4
           - name: CATTLE_INGRESS_IP_DOMAIN
             value: sslip.io
-          image: rancher/rancher-agent:v2.7.3
+          image: rancher/rancher-agent:v2.9.0
           volumeMounts:
           - name: cattle-credentials
             mountPath: /cattle-credentials

diff --git a/scripts/kind-cluster-with-extramounts.yaml b/scripts/kind-cluster-with-extramounts.yaml
@@ -3,7 +3,7 @@ apiVersion: kind.x-k8s.io/v1alpha4
 name: capi-test
 nodes:
 - role: control-plane
-  image: kindest/node:v1.27.13
+  image: kindest/node:v1.30.0
   extraMounts:
     - hostPath: /var/run/docker.sock
       containerPath: /var/run/docker.sock
diff --git a/scripts/turtles-dev.sh b/scripts/turtles-dev.sh
@@ -20,7 +20,7 @@ if [ -z "$RANCHER_HOSTNAME" ]; then
 	exit 1
 fi
 
-RANCHER_VERSION=${RANCHER_VERSION:-v2.8.2}
+RANCHER_VERSION=${RANCHER_VERSION:-v2.9.0}
 
 BASEDIR=$(dirname "$0")
 
@@ -43,8 +43,8 @@ export CLUSTER_TOPOLOGY=true
 
 helm install capi-operator capi-operator/cluster-api-operator \
 	--create-namespace -n capi-operator-system \
-	--set infrastructure=docker:v1.4.6 \
-	--set core=cluster-api:v1.4.6 \
+	--set infrastructure=docker:v1.7.3 \
+	--set core=cluster-api:v1.7.3 \
 	--timeout 90s --wait
 
 kubectl rollout status deployment capi-operator-cluster-api-operator -n capi-operator-system --timeout=180s

diff --git a/test/e2e/config/operator.yaml b/test/e2e/config/operator.yaml
@@ -28,17 +28,17 @@ intervals:
 
 variables:
   MANAGEMENT_CLUSTER_INFRASTRUCTURE: "isolated-kind" # supported options are eks, isolated-kind, kind
-  RANCHER_VERSION: "v2.8.1"
+  RANCHER_VERSION: "v2.9.0"
   RANCHER_ALPHA_VERSION: "v2.9.1-alpha1"
-  KUBERNETES_VERSION: "v1.28.6"
-  KUBERNETES_MANAGEMENT_VERSION: "v1.27.0"
+  KUBERNETES_VERSION: "v1.30.3"
+  KUBERNETES_MANAGEMENT_VERSION: "v1.30.0"
   KUBERNETES_MANAGEMENT_AWS_REGION: "eu-west-2"
   RANCHER_HOSTNAME: "localhost"
   RANCHER_FEATURES: ""
   RANCHER_PATH: "rancher-latest/rancher"
   RANCHER_ALPHA_PATH: "rancher-alpha/rancher"
-  CPI_IMAGE_K8S_VERSION: "v1.27.0"
-  RKE2_VERSION: "v1.28.1+rke2r1"
+  CPI_IMAGE_K8S_VERSION: "v1.30.0"
+  RKE2_VERSION: "v1.30.3+rke2r1"
   RANCHER_REPO_NAME: "rancher-latest"
   RANCHER_ALPHA_REPO_NAME: "rancher-alpha"
   RANCHER_URL: "https://releases.rancher.com/server-charts/latest"
@@ -56,6 +56,6 @@ variables:
   GITEA_REPO_NAME: "gitea-charts"
   GITEA_REPO_URL: "https://dl.gitea.com/charts/"
   GITEA_CHART_NAME: "gitea"
-  GITEA_CHART_VERSION: "9.4.0"
+  GITEA_CHART_VERSION: "9.6.0"
   GITEA_USER_NAME: "gitea_admin"
   GITEA_USER_PWD: "password"
diff --git a/test/go.mod b/test/go.mod
@@ -16,10 +16,10 @@ require (
 	k8s.io/client-go v0.29.4
 	k8s.io/klog/v2 v2.110.1
 	k8s.io/utils v0.0.0-20231127182322-b307cd553661
-	sigs.k8s.io/cluster-api v1.7.1
+	sigs.k8s.io/cluster-api v1.7.3
 	sigs.k8s.io/cluster-api-operator v0.12.0
 	sigs.k8s.io/cluster-api-operator/test v0.12.0
-	sigs.k8s.io/cluster-api/test v1.7.1
+	sigs.k8s.io/cluster-api/test v1.7.3
 	sigs.k8s.io/controller-runtime v0.17.3
 	sigs.k8s.io/yaml v1.4.0
 )
@@ -152,6 +152,6 @@ require (
 	k8s.io/component-base v0.29.4 // indirect
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kind v0.22.0 // indirect
+	sigs.k8s.io/kind v0.23.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )