Update test env Kube to lowest supported (#234)

* Update test env Kube to lowest supported * Upgrade Go to 1.18 * Upgrade Gothub actions Go version too * Try to solve mockgen not found issue * Update envtest and fix Shared volume tests
storageos · Sep 20, 2022 · a7cde31 · a7cde31
1 parent de893c6
commit a7cde31
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 89 deletions.
diff --git a/.github/linters-cfg/.golangci.yml b/.github/linters-cfg/.golangci.yml
@@ -33,7 +33,7 @@ linters-settings:
     # report about shadowed variables
     check-shadowing: false
   gosimple:
-    go: "1.17"
+    go: "1.18"
     checks: [ "-S1019" ]     
   forbidigo:
     forbid:

diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
@@ -68,7 +68,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-         go-version: 1.17
+         go-version: 1.18
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Run linter
@@ -113,9 +113,9 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Run tests
-        run: make test
+        run: PATH=$PWD/bin:$PATH make test
 
   build:
     name: Build binary
@@ -125,7 +125,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-         go-version: 1.17
+         go-version: 1.18
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Build binary

diff --git a/.github/workflows/kuttl-e2e-test-1.21.yaml b/.github/workflows/kuttl-e2e-test-1.21.yaml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Install kuttl and kubectl
         run: |
           sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64

diff --git a/.github/workflows/kuttl-e2e-test-1.22.yaml b/.github/workflows/kuttl-e2e-test-1.22.yaml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Install kuttl and kubectl
         run: |
           sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64

diff --git a/.github/workflows/kuttl-e2e-test-1.23.yaml b/.github/workflows/kuttl-e2e-test-1.23.yaml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Install kuttl and kubectl
         run: |
           sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64

diff --git a/.github/workflows/kuttl-e2e-test-1.24.yaml b/.github/workflows/kuttl-e2e-test-1.24.yaml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Install kuttl and kubectl
         run: |
           sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64

diff --git a/.github/workflows/kuttl-e2e-test-1.25.yaml b/.github/workflows/kuttl-e2e-test-1.25.yaml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Install kuttl and kubectl
         run: |
           sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.17.11 as builder
+FROM golang:1.18 as builder
 
 WORKDIR /workspace
 COPY . /workspace

diff --git a/Makefile b/Makefile
@@ -78,6 +78,10 @@ RELATED_IMAGE_METRICS_EXPORTER=${METRICS_EXPORTER_IMAGE}
 endef
 export REL_IMAGE_CONF
 
+# KUBEBUILDER_ASSETS path is set as environment variable when running envtest.
+ENVTEST_BIN_VERSION = 1.21.4
+KUBEBUILDER_ASSETS = $(shell $(SETUP_ENVTEST) use -i -p path $(ENVTEST_BIN_VERSION))
+
 _env:
 	env
 
@@ -133,11 +137,9 @@ metrics-exporter:
 lint: ## Run golangci-lint
 	golangci-lint run --config .github/linters-cfg/.golangci.yml
 
-ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
-test: ## Run unit tests
-	mkdir -p ${ENVTEST_ASSETS_DIR}
-	test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0/hack/setup-envtest.sh
-	source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
+test: manifests generate setup-envtest ## Run unit tests
+	KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) \
+		go test ./... -coverprofile cover.out
 
 .PHONY: e2e
 e2e: ## Run end to end tests
@@ -222,6 +224,11 @@ bundle: operator-sdk manifests kustomize ## Generate bundle manifests and metada
 
 ##@ Deps
 
+SETUP_ENVTEST = $(shell pwd)/bin/setup-envtest
+setup-envtest:
+	$(call go-get-tool,$(SETUP_ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
+	$(SETUP_ENVTEST) use $(ENVTEST_BIN_VERSION)
+
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
 	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.0)

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/storageos/operator
 
-go 1.17
+go 1.18
 
 require (
 	github.com/blang/semver v3.5.1+incompatible