✨ upgrade k8s from 1.25 to 1.26 (#3147)

Author: camilamacedo86

build/.goreleaser.yml

@@ -44,7 +44,7 @@ builds:
       - darwin_amd64
       - darwin_arm64
     env:
-      - KUBERNETES_VERSION=1.25.0
+      - KUBERNETES_VERSION=1.26.0
       - CGO_ENABLED=0
 
 # Only binaries of the form "kubebuilder_${goos}_${goarch}" will be released.

docs/book/src/component-config-tutorial/testdata/project/Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.26.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

pkg/plugins/golang/declarative/v1/api.go

@@ -31,8 +31,8 @@ import (
 
 const (
 	// kbDeclarativePattern is the sigs.k8s.io/kubebuilder-declarative-pattern version
-	kbDeclarativePatternForV2 = "v0.0.0-20200522144838-848d48e5b073"
-	kbDeclarativePatternForV3 = "e0605f0e1a40f97293cb3773f57de695c8bc76af"
+	kbDeclarativePatternForV2   = "v0.0.0-20200522144838-848d48e5b073"
+	kbDeclarativePatternForV3V4 = "18dbaf5fcd851e6adc3f2f8a8facb669a1420797"
 )
 
 var _ plugin.CreateAPISubcommand = &createAPISubcommand{}
@@ -125,7 +125,7 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error {
 	// Ensure that we are pinning sigs.k8s.io/kubebuilder-declarative-pattern version
 	// Just pin an old value for go/v2. It shows fine for now. However, we should improve/change it
 	// if we see that more rules based on the plugins version are required.
-	kbDeclarativePattern := kbDeclarativePatternForV3
+	kbDeclarativePattern := kbDeclarativePatternForV3V4
 	for _, pluginKey := range p.config.GetPluginChain() {
 		if pluginKey == plugin.KeyFor(goPluginV2.Plugin{}) {
 			kbDeclarativePattern = kbDeclarativePatternForV2

pkg/plugins/golang/v3/commons.go

@@ -78,7 +78,7 @@ manifests: controller-gen`
 		}
 
 		if err := util.ReplaceInFile("Makefile",
-			"ENVTEST_K8S_VERSION = 1.25.0",
+			"ENVTEST_K8S_VERSION = 1.26.0",
 			"ENVTEST_K8S_VERSION = 1.21"); err != nil {
 			log.Warnf("unable to update the Makefile with %s: %s", "ENVTEST_K8S_VERSION = 1.21", err)
 		}

pkg/plugins/golang/v3/scaffolds/init.go

@@ -34,9 +34,9 @@ import (
 
 const (
 	// ControllerRuntimeVersion is the kubernetes-sigs/controller-runtime version to be used in the project
-	ControllerRuntimeVersion = "v0.13.1"
+	ControllerRuntimeVersion = "v0.14.1"
 	// ControllerToolsVersion is the kubernetes-sigs/controller-tools version to be used in the project
-	ControllerToolsVersion = "v0.10.0"
+	ControllerToolsVersion = "v0.11.1"
 
 	imageName = "controller:latest"
 )

pkg/plugins/golang/v3/scaffolds/internal/templates/makefile.go

@@ -62,7 +62,7 @@ const makefileTemplate = `
 # Image URL to use all building/pushing image targets
 IMG ?= {{ .Image }}
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.26.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

pkg/plugins/golang/v4/scaffolds/init.go

@@ -34,9 +34,9 @@ import (
 
 const (
 	// ControllerRuntimeVersion is the kubernetes-sigs/controller-runtime version to be used in the project
-	ControllerRuntimeVersion = "v0.13.1"
+	ControllerRuntimeVersion = "v0.14.1"
 	// ControllerToolsVersion is the kubernetes-sigs/controller-tools version to be used in the project
-	ControllerToolsVersion = "v0.10.0"
+	ControllerToolsVersion = "v0.11.1"
 
 	imageName = "controller:latest"
 )

pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go

@@ -62,7 +62,7 @@ const makefileTemplate = `
 # Image URL to use all building/pushing image targets
 IMG ?= {{ .Image }}
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.26.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

test/common.sh

@@ -28,6 +28,7 @@ function convert_to_tools_ver {
   "1.23") echo "1.23.3";;
   "1.24") echo "1.24.1";;
   "1.25") echo "1.25.0";;
+  "1.26") echo "1.26.0";;
   *)
     echo "k8s version $k8s_ver not supported"
     exit 1
@@ -47,7 +48,7 @@ if [ -n "$TRACE" ]; then
   set -x
 fi
 
-export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.25.0"}"
+export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.26.0"}"
 tools_k8s_version=$(convert_to_tools_ver "${KIND_K8S_VERSION#v*}")
 kind_version=0.15.0
 goarch=amd64

testdata/project-v3-config/Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.26.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -133,7 +133,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v3.8.7
-CONTROLLER_TOOLS_VERSION ?= v0.10.0
+CONTROLLER_TOOLS_VERSION ?= v0.11.1
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize