Skip to content

Commit 8f5e7af

Browse files
committed
Update envtest version (1.24.2 -> 1.25.0)
1 parent b38e47c commit 8f5e7af

File tree

18 files changed

+23
-23
lines changed

18 files changed

+23
-23
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.24.1
5+
ENVTEST_K8S_VERSION = 1.25.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))

docs/book/src/cronjob-tutorial/testdata/project/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.24.1
5+
ENVTEST_K8S_VERSION = 1.25.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))

docs/book/src/cronjob-tutorial/testdata/project/api/v1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/book/src/multiversion-tutorial/testdata/project/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.24.1
5+
ENVTEST_K8S_VERSION = 1.25.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))

docs/book/src/reference/envtest.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The `make test` command will install these binaries to the `bin/` directory and
8484
Ie,
8585
```shell
8686
./bin/k8s/
87-
└── 1.24.2-darwin-amd64
87+
└── 1.25.0-darwin-amd64
8888
├── etcd
8989
├── kube-apiserver
9090
└── kubectl
@@ -108,11 +108,11 @@ See that the `test` makefile target will ensure that all is properly setup when
108108

109109
```go
110110
var _ = BeforeSuite(func(done Done) {
111-
Expect(os.Setenv("TEST_ASSET_KUBE_APISERVER", "../bin/k8s/1.24.2-darwin-amd64/kube-apiserver")).To(Succeed())
112-
Expect(os.Setenv("TEST_ASSET_ETCD", "../bin/k8s/1.24.2-darwin-amd64/etcd")).To(Succeed())
113-
Expect(os.Setenv("TEST_ASSET_KUBECTL", "../bin/k8s/1.24.2-darwin-amd64/kubectl")).To(Succeed())
111+
Expect(os.Setenv("TEST_ASSET_KUBE_APISERVER", "../bin/k8s/1.25.0-darwin-amd64/kube-apiserver")).To(Succeed())
112+
Expect(os.Setenv("TEST_ASSET_ETCD", "../bin/k8s/1.25.0-darwin-amd64/etcd")).To(Succeed())
113+
Expect(os.Setenv("TEST_ASSET_KUBECTL", "../bin/k8s/1.25.0-darwin-amd64/kubectl")).To(Succeed())
114114
// OR
115-
Expect(os.Setenv("KUBEBUILDER_ASSETS", "../bin/k8s/1.24.2-darwin-amd64")).To(Succeed())
115+
Expect(os.Setenv("KUBEBUILDER_ASSETS", "../bin/k8s/1.25.0-darwin-amd64")).To(Succeed())
116116
117117
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
118118
testenv = &envtest.Environment{}

pkg/plugins/golang/v3/commons.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ manifests: controller-gen`
7878
}
7979

8080
if err := util.ReplaceInFile("Makefile",
81-
"ENVTEST_K8S_VERSION = 1.24.2",
81+
"ENVTEST_K8S_VERSION = 1.25.0",
8282
"ENVTEST_K8S_VERSION = 1.21"); err != nil {
8383
log.Warnf("unable to update the Makefile with %s: %s", "ENVTEST_K8S_VERSION = 1.21", err)
8484
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const makefileTemplate = `
6161
# Image URL to use all building/pushing image targets
6262
IMG ?= {{ .Image }}
6363
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
64-
ENVTEST_K8S_VERSION = 1.24.2
64+
ENVTEST_K8S_VERSION = 1.25.0
6565
6666
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
6767
ifeq (,$(shell go env GOBIN))

test/common.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function convert_to_tools_ver {
2727
"1.22") echo "1.22.1";;
2828
"1.23") echo "1.23.3";;
2929
"1.24") echo "1.24.1";;
30+
"1.25") echo "1.25.0";;
3031
*)
3132
echo "k8s version $k8s_ver not supported"
3233
exit 1
@@ -46,9 +47,9 @@ if [ -n "$TRACE" ]; then
4647
set -x
4748
fi
4849

49-
export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.24.1"}"
50+
export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.25.0"}"
5051
tools_k8s_version=$(convert_to_tools_ver "${KIND_K8S_VERSION#v*}")
51-
kind_version=0.14.0
52+
kind_version=0.15.0
5253
goarch=amd64
5354

5455
if [[ "$OSTYPE" == "linux-gnu" ]]; then

testdata/project-v3-addon-and-grafana/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.24.2
5+
ENVTEST_K8S_VERSION = 1.25.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))

testdata/project-v3-config/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
ENVTEST_K8S_VERSION = 1.24.2
5+
ENVTEST_K8S_VERSION = 1.25.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))

0 commit comments

Comments
 (0)