Reapply "Update Supported Kubernetes to 1.28, 1.29, 1.30 (#3933)" (#3952

) (#3961) This reverts commit a348312.
googleforgames · Aug 21, 2024 · 2eefa94 · 2eefa94
1 parent 1a1a7ef
commit 2eefa94
Show file tree

Hide file tree

Showing 418 changed files with 17,059 additions and 16,520 deletions.
diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
@@ -53,7 +53,7 @@ RUN go install golang.org/x/tools/cmd/goimports@latest && \
 #
 # When this is raised to 1.29: bump the code-generator version on line 66 to the v0.30 tag.
 # When this is raised to >=1.30: delete line 66-67 and uncomment line 68 to stop pinning code-generator.
-ENV KUBERNETES_VER 1.28.6
+ENV KUBERNETES_VER 1.29.7
 
 # overwrite kubectl as we want a specific version
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VER}/bin/linux/amd64/kubectl && \
@@ -63,9 +63,9 @@ RUN echo "source <(kubectl completion bash)" >> /root/.bashrc
 
 # install the release branch of the code generator tools
 RUN mkdir -p /go/src/k8s.io && cd /go/src/k8s.io && \
-    git clone -b v0.30.0-beta.0 --depth=3 https://github.com/kubernetes/code-generator.git
-    # We are pinning code-generator for now - kube_codegen.sh has substantial improvements in later releases.
-    # git clone -b kubernetes-${KUBERNETES_VER} --depth=3 https://github.com/kubernetes/code-generator.git
+    git clone -b v0.30.0 --depth=3 https://github.com/kubernetes/code-generator.git
+# We are pinning code-generator for now - kube_codegen.sh has substantial improvements in later releases.
+# git clone -b kubernetes-${KUBERNETES_VER} --depth=3 https://github.com/kubernetes/code-generator.git
 
 # install Helm package manager
 ENV HELM_VER 3.10.3

diff --git a/build/e2e-image/Dockerfile b/build/e2e-image/Dockerfile
@@ -15,7 +15,7 @@ RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
 ENV PATH /usr/local/go/bin:/go/bin:$PATH
 
 # install kubectl without gcloud as we want the last version
-ENV KUBECTL_VER 1.28.6
+ENV KUBECTL_VER 1.29.7
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VER}/bin/linux/amd64/kubectl && \
     chmod go+rx ./kubectl && \
     mv ./kubectl /usr/local/bin/kubectl

diff --git a/build/includes/kind.mk b/build/includes/kind.mk
@@ -26,7 +26,7 @@ kind-test-cluster: DOCKER_RUN_ARGS+=--network=host
 kind-test-cluster: $(ensure-build-image)
 	@if [ -z $$(kind get clusters | grep $(KIND_PROFILE)) ]; then\
 		echo "Could not find $(KIND_PROFILE) cluster. Creating...";\
-		kind create cluster --name $(KIND_PROFILE) --image kindest/node:v1.28.6 --wait 5m;\
+		kind create cluster --name $(KIND_PROFILE) --image kindest/node:v1.29.7 --wait 5m;\
 	fi
 
 # deletes the kind agones cluster

diff --git a/build/includes/minikube.mk b/build/includes/minikube.mk
@@ -28,7 +28,7 @@ minikube_cert_mount := ~/.minikube:$(HOME)/.minikube
 # of the right version.
 minikube-test-cluster: DOCKER_RUN_ARGS+=--network=host -v $(minikube_cert_mount)
 minikube-test-cluster: $(ensure-build-image)
-	$(MINIKUBE) start --kubernetes-version v1.28.6 -p $(MINIKUBE_PROFILE) --driver $(MINIKUBE_DRIVER)
+	$(MINIKUBE) start --kubernetes-version v1.29.7 -p $(MINIKUBE_PROFILE) --driver $(MINIKUBE_DRIVER)
 
 # Connecting to minikube requires so enhanced permissions, so use this target
 # instead of `make shell` to start an interactive shell for development on minikube.

diff --git a/build/includes/sdk.mk b/build/includes/sdk.mk
@@ -20,7 +20,7 @@
 #   \__, |_| \_\_|    \____|   |_|\___/ \___/|_|_|_| |_|\__, |
 #   |___/                                               |___/
 
-grpc_release_tag = v1.57.1
+grpc_release_tag = v1.58.3
 
 build_sdk_base_version = $(call sha,$(build_path)/build-sdk-images/tool/base/Dockerfile)_$(grpc_release_tag)
 build_sdk_base_tag = agones-build-sdk-base:$(build_sdk_base_version)

diff --git a/build/terraform/e2e/module.tf b/build/terraform/e2e/module.tf
@@ -41,7 +41,8 @@ variable "kubernetes_versions" {
     "1.27" = ["us-east1", "RAPID"]
     "1.28" = ["us-west1", "RAPID"]
     "1.29" = ["europe-west1", "RAPID"]
-    // "1.30" = ["asia-east1", "RAPID"]
+    "1.30" = ["asia-east1", "RAPID"]
+    // "1.31" = ["us-east1", "RAPID"]
     //
     // Before merge: When adding Kubernetes version 1.{N}, first uncomment the line above, extending
     // the infrastructure to 4 versions temporarily. Come back to these instructions after the

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -271,15 +271,15 @@ steps:
         set -o pipefail
         pids=()
         cloudProducts=("generic" "gke-autopilot")
-        declare -A versionsAndRegions=( [1.27]=us-east1 [1.28]=us-west1 [1.29]=europe-west1 )
+        declare -A versionsAndRegions=( [1.28]=us-west1 [1.29]=europe-west1 [1.30]=asia-east1 )
 
         # Keep in sync with (the inverse of) pkg/util/runtime/features.go:featureDefaults
         featureWithGate="PlayerAllocationFilter=true&PlayerTracking=true&CountsAndLists=false&RollingUpdateFix=true&PortRanges=true&PortPolicyNone=true&DisableResyncOnSDKServer=false&AutopilotPassthroughPort=false&Example=true"
         featureWithoutGate=""
 
         # Use this if specific feature gates can only be supported on specific Kubernetes versions.
         # TODO: When 1.28 becomes trailing version, promote GKEAutopilotExtendedDurationPods to beta.
-        declare -A featureWithGateByVersion=( [1.27]="${featureWithGate}" [1.28]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true" [1.29]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true")
+        declare -A featureWithGateByVersion=( [1.28]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true" [1.29]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true" [1.30]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true")
 
         for cloudProduct in ${cloudProducts[@]}
         do

diff --git a/examples/cpp-simple/Dockerfile b/examples/cpp-simple/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \
 WORKDIR /project
 
 # Install gRPC and dependencies
-RUN git clone --recurse-submodules -b v1.57.1 --depth 1 --shallow-submodules https://github.com/grpc/grpc /var/local/git/grpc && \
+RUN git clone --recurse-submodules -b v1.58.3 --depth 1 --shallow-submodules https://github.com/grpc/grpc /var/local/git/grpc && \
     cd /var/local/git/grpc && \
     mkdir -p cmake/build && \
     cd cmake/build && \

diff --git a/examples/cpp-simple/Makefile b/examples/cpp-simple/Makefile
@@ -30,7 +30,7 @@ PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
 root_path = $(realpath $(project_path)/../..)
-version := 0.17
+version := 0.18
 ifeq ($(REPOSITORY),)
 	server_tag := cpp-simple-server:$(version)
 else

diff --git a/go.mod b/go.mod
@@ -10,11 +10,11 @@ require (
 	fortio.org/fortio v1.3.1
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
 	github.com/evanphx/json-patch v4.12.0+incompatible
-	github.com/fsnotify/fsnotify v1.6.0
+	github.com/fsnotify/fsnotify v1.7.0
 	github.com/go-openapi/spec v0.19.5
-	github.com/google/go-cmp v0.5.9
+	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.3.0
-	github.com/gorilla/websocket v1.4.2
+	github.com/gorilla/websocket v1.5.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1
 	github.com/hashicorp/golang-lru v0.5.1
 	github.com/heptiolabs/healthcheck v0.0.0-20171201210846-da5fdee475fb
@@ -27,7 +27,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
 	go.opencensus.io v0.24.0
 	golang.org/x/net v0.23.0
@@ -37,17 +37,17 @@ require (
 	gomodules.xyz/jsonpatch/v2 v2.4.0
 	google.golang.org/api v0.138.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
-	google.golang.org/grpc v1.57.1
+	google.golang.org/grpc v1.58.3
 	google.golang.org/protobuf v1.33.0
 	gopkg.in/fsnotify.v1 v1.4.7
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
-	k8s.io/api v0.28.6
-	k8s.io/apiextensions-apiserver v0.28.6
-	k8s.io/apimachinery v0.28.6
-	k8s.io/client-go v0.28.6
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3
+	k8s.io/api v0.29.7
+	k8s.io/apiextensions-apiserver v0.29.7
+	k8s.io/apimachinery v0.29.7
+	k8s.io/client-go v0.29.7
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 )
 
 require (
@@ -60,15 +60,15 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v1.1.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/s2a-go v0.1.5 // indirect
@@ -109,9 +109,9 @@ require (
 	gopkg.in/ini.v1 v1.51.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
+	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
 	k8s.io/klog v1.0.0 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )