Skip to content

Commit

Permalink
Update Supported Kubernetes to 1.29, 1.30, 1.31 (googleforgames#4024)
Browse files Browse the repository at this point in the history
* Update Supported to 1.29, 1.30, 1.31

* nit

* regenerate crd docs

* revert ID

* using 1.30.4 patch version

---------

Co-authored-by: Mengye (Max) Gong <[email protected]>
  • Loading branch information
2 people authored and 0xaravindh committed Nov 26, 2024
1 parent 23bbb0c commit 18ec7b9
Show file tree
Hide file tree
Showing 46 changed files with 16,106 additions and 16,228 deletions.
9 changes: 2 additions & 7 deletions build/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ RUN go install golang.org/x/tools/cmd/goimports@latest && \
go install golang.org/x/pkgsite/cmd/pkgsite@latest

# the kubernetes version for the file
#
# 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.29.7
ENV KUBERNETES_VER 1.30.4

# 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 && \
Expand All @@ -63,9 +60,7 @@ 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 --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 kubernetes-${KUBERNETES_VER} --depth=3 https://github.com/kubernetes/code-generator.git

# install Helm package manager
ENV HELM_VER 3.10.3
Expand Down
2 changes: 1 addition & 1 deletion build/e2e-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.29.7
ENV KUBECTL_VER 1.30.4
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
Expand Down
2 changes: 1 addition & 1 deletion build/includes/kind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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.29.7 --wait 5m;\
kind create cluster --name $(KIND_PROFILE) --image kindest/node:v1.30.4 --wait 5m;\
fi

# deletes the kind agones cluster
Expand Down
2 changes: 1 addition & 1 deletion build/includes/minikube.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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.29.7 -p $(MINIKUBE_PROFILE) --driver $(MINIKUBE_DRIVER)
$(MINIKUBE) start --kubernetes-version v1.30.4 -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.
Expand Down
2 changes: 1 addition & 1 deletion build/includes/sdk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# \__, |_| \_\_| \____| |_|\___/ \___/|_|_|_| |_|\__, |
# |___/ |___/

grpc_release_tag = v1.58.3
grpc_release_tag = v1.65.0

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)
Expand Down
3 changes: 2 additions & 1 deletion build/terraform/e2e/module.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ variable "kubernetes_versions" {
"1.28" = ["us-west1", "RAPID"]
"1.29" = ["europe-west1", "RAPID"]
"1.30" = ["asia-east1", "RAPID"]
// "1.31" = ["us-east1", "RAPID"]
"1.31" = ["us-east1", "RAPID"]
//1.32" = ["us-west1", "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
Expand Down
4 changes: 2 additions & 2 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,14 @@ steps:
set -o pipefail
pids=()
cloudProducts=("generic" "gke-autopilot")
declare -A versionsAndRegions=( [1.28]=us-west1 [1.29]=europe-west1 [1.30]=asia-east1 )
declare -A versionsAndRegions=( [1.29]=europe-west1 [1.30]=asia-east1 [1.31]=us-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&ScheduledAutoscaler=true&DisableResyncOnSDKServer=false&AutopilotPassthroughPort=false&GKEAutopilotExtendedDurationPods=false&Example=true"
featureWithoutGate=""
# Use this if specific feature gates can only be supported on specific Kubernetes versions.
declare -A featureWithGateByVersion=( [1.28]="${featureWithGate}" [1.29]="${featureWithGate}" [1.30]="${featureWithGate}")
declare -A featureWithGateByVersion=( [1.29]="${featureWithGate}" [1.30]="${featureWithGate}" [1.31]="${featureWithGate}")
for cloudProduct in ${cloudProducts[@]}
do
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp-simple/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.58.3 --depth 1 --shallow-submodules https://github.com/grpc/grpc /var/local/git/grpc && \
RUN git clone --recurse-submodules -b v1.65.0 --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 && \
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp-simple/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.18
version := 0.19
ifeq ($(REPOSITORY),)
server_tag := cpp-simple-server:$(version)
else
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module agones.dev/agones

go 1.22
go 1.22.0

toolchain go1.22.6

Expand Down
Loading

0 comments on commit 18ec7b9

Please sign in to comment.