File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -9,8 +9,9 @@ export IMAGE_VERSION = v1.11.0
9
9
export SIMPLE_VERSION = $(shell (test "$(shell git describe) " = "$(shell git describe --abbrev=0) " && echo $(shell git describe) ) || echo $(shell git describe --abbrev=0) +git)
10
10
export GIT_VERSION = $(shell git describe --dirty --tags --always)
11
11
export GIT_COMMIT = $(shell git rev-parse HEAD)
12
+ export K8S_VERSION = 1.21
12
13
# TODO: bump this to 1.21, after kubectl `--generator` flag is removed from e2e tests.
13
- export K8S_VERSION = 1.20.2
14
+ export ENVTEST_K8S_VERSION = 1.20.2
14
15
15
16
# Build settings
16
17
export TOOLS_DIR = tools/bin
@@ -146,11 +147,11 @@ e2e_targets := test-e2e $(e2e_tests)
146
147
.PHONY : test-e2e-setup
147
148
export KIND_CLUSTER := operator-sdk-e2e
148
149
149
- export KUBEBUILDER_ASSETS = $(PWD ) /$(shell go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest && $(shell go env GOPATH) /bin/setup-envtest use $(K8S_VERSION ) --bin-dir tools/bin/ -p path)
150
+ export KUBEBUILDER_ASSETS = $(PWD ) /$(shell go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest && $(shell go env GOPATH) /bin/setup-envtest use $(ENVTEST_K8S_VERSION ) --bin-dir tools/bin/ -p path)
150
151
test-e2e-setup : build
151
152
$(SCRIPTS_DIR ) /fetch kind 0.11.0
152
- $(SCRIPTS_DIR ) /fetch kubectl $(K8S_VERSION ) # Install kubectl AFTER envtest because envtest includes its own kubectl binary
153
- [[ " ` $( TOOLS_DIR) /kind get clusters` " =~ " $( KIND_CLUSTER) " ]] || $(TOOLS_DIR ) /kind create cluster --image=" kindest/node:v$( K8S_VERSION ) " --name $(KIND_CLUSTER )
153
+ $(SCRIPTS_DIR ) /fetch kubectl $(ENVTEST_K8S_VERSION ) # Install kubectl AFTER envtest because envtest includes its own kubectl binary
154
+ [[ " ` $( TOOLS_DIR) /kind get clusters` " =~ " $( KIND_CLUSTER) " ]] || $(TOOLS_DIR ) /kind create cluster --image=" kindest/node:v$( ENVTEST_K8S_VERSION ) " --name $(KIND_CLUSTER )
154
155
155
156
.PHONY : test-e2e-teardown
156
157
test-e2e-teardown :
You can’t perform that action at this time.
0 commit comments