Merge pull request #804 from yiannistri/fix-e2e-gke-version-v2.8

[2.8] ci: Use supported GKE version for e2e tests

Makefile

@@ -31,7 +31,7 @@ MOCKGEN_VER := v1.6.0
 MOCKGEN_BIN := mockgen
 MOCKGEN := $(BIN_DIR)/$(MOCKGEN_BIN)-$(MOCKGEN_VER)
 
-GINKGO_VER := v2.20.2
+GINKGO_VER := v2.22.2
 GINKGO_BIN := ginkgo
 GINKGO := $(BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
 
@@ -51,14 +51,6 @@ endif
 
 default: operator
 
-.dapper:
-	@echo Downloading dapper
-	@curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m` > .dapper.tmp
-	@@chmod +x .dapper.tmp
-	@./.dapper.tmp -v
-	@mv .dapper.tmp .dapper
-
-
 .PHONY: generate-go
 generate-go: $(MOCKGEN)
 	go generate ./pkg/gke/...
@@ -76,10 +68,6 @@ generate:
 clean:
 	rm -rf build bin dist
 
-.PHONY: $(TARGETS)
-$(TARGETS): .dapper
-	./.dapper $@
-
 $(MOCKGEN):
 	GOBIN=$(BIN_DIR) $(GO_INSTALL) github.com/golang/mock/mockgen $(MOCKGEN_BIN) $(MOCKGEN_VER)
 

test/e2e/templates/basic-cluster.yaml

@@ -8,7 +8,7 @@ spec:
   labels: {}
   region: "us-west1"
   projectID: "${GKE_PROJECT_ID}"
-  kubernetesVersion: "1.28.15-gke.1388000"
+  kubernetesVersion: "1.28.15-gke.1480000"
   loggingService: ""
   monitoringService: ""
   enableKubernetesAlpha: false
@@ -23,7 +23,7 @@ spec:
       labels: {}
     initialNodeCount: 1
     maxPodsConstraint: 110
-    version: "1.28.15-gke.1388000"
+    version: "1.28.15-gke.1480000"
     management:
       autoRepair: true
       autoUpgrade: true