Skip to content

Commit 3fa5ab7

Browse files
ashutosjigongmax
andauthored
Update Supported Kubernetes to 1.28, 1.29, 1.30 (#3933)
Co-authored-by: Mengye (Max) Gong <8364575+gongmax@users.noreply.github.com>
1 parent c817372 commit 3fa5ab7

File tree

418 files changed

+17059
-16520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

418 files changed

+17059
-16520
lines changed

build/build-image/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN go install golang.org/x/tools/cmd/goimports@latest && \
5353
#
5454
# When this is raised to 1.29: bump the code-generator version on line 66 to the v0.30 tag.
5555
# When this is raised to >=1.30: delete line 66-67 and uncomment line 68 to stop pinning code-generator.
56-
ENV KUBERNETES_VER 1.28.6
56+
ENV KUBERNETES_VER 1.29.7
5757

5858
# overwrite kubectl as we want a specific version
5959
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
6363

6464
# install the release branch of the code generator tools
6565
RUN mkdir -p /go/src/k8s.io && cd /go/src/k8s.io && \
66-
git clone -b v0.30.0-beta.0 --depth=3 https://github.com/kubernetes/code-generator.git
67-
# We are pinning code-generator for now - kube_codegen.sh has substantial improvements in later releases.
68-
# git clone -b kubernetes-${KUBERNETES_VER} --depth=3 https://github.com/kubernetes/code-generator.git
66+
git clone -b v0.30.0 --depth=3 https://github.com/kubernetes/code-generator.git
67+
# We are pinning code-generator for now - kube_codegen.sh has substantial improvements in later releases.
68+
# git clone -b kubernetes-${KUBERNETES_VER} --depth=3 https://github.com/kubernetes/code-generator.git
6969

7070
# install Helm package manager
7171
ENV HELM_VER 3.10.3

build/e2e-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
1515
ENV PATH /usr/local/go/bin:/go/bin:$PATH
1616

1717
# install kubectl without gcloud as we want the last version
18-
ENV KUBECTL_VER 1.28.6
18+
ENV KUBECTL_VER 1.29.7
1919
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VER}/bin/linux/amd64/kubectl && \
2020
chmod go+rx ./kubectl && \
2121
mv ./kubectl /usr/local/bin/kubectl

build/includes/kind.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ kind-test-cluster: DOCKER_RUN_ARGS+=--network=host
2626
kind-test-cluster: $(ensure-build-image)
2727
@if [ -z $$(kind get clusters | grep $(KIND_PROFILE)) ]; then\
2828
echo "Could not find $(KIND_PROFILE) cluster. Creating...";\
29-
kind create cluster --name $(KIND_PROFILE) --image kindest/node:v1.28.6 --wait 5m;\
29+
kind create cluster --name $(KIND_PROFILE) --image kindest/node:v1.29.7 --wait 5m;\
3030
fi
3131

3232
# deletes the kind agones cluster

build/includes/minikube.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ minikube_cert_mount := ~/.minikube:$(HOME)/.minikube
2828
# of the right version.
2929
minikube-test-cluster: DOCKER_RUN_ARGS+=--network=host -v $(minikube_cert_mount)
3030
minikube-test-cluster: $(ensure-build-image)
31-
$(MINIKUBE) start --kubernetes-version v1.28.6 -p $(MINIKUBE_PROFILE) --driver $(MINIKUBE_DRIVER)
31+
$(MINIKUBE) start --kubernetes-version v1.29.7 -p $(MINIKUBE_PROFILE) --driver $(MINIKUBE_DRIVER)
3232

3333
# Connecting to minikube requires so enhanced permissions, so use this target
3434
# instead of `make shell` to start an interactive shell for development on minikube.

build/includes/sdk.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# \__, |_| \_\_| \____| |_|\___/ \___/|_|_|_| |_|\__, |
2121
# |___/ |___/
2222

23-
grpc_release_tag = v1.57.1
23+
grpc_release_tag = v1.58.3
2424

2525
build_sdk_base_version = $(call sha,$(build_path)/build-sdk-images/tool/base/Dockerfile)_$(grpc_release_tag)
2626
build_sdk_base_tag = agones-build-sdk-base:$(build_sdk_base_version)

build/terraform/e2e/module.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ variable "kubernetes_versions" {
4141
"1.27" = ["us-east1", "RAPID"]
4242
"1.28" = ["us-west1", "RAPID"]
4343
"1.29" = ["europe-west1", "RAPID"]
44-
// "1.30" = ["asia-east1", "RAPID"]
44+
"1.30" = ["asia-east1", "RAPID"]
45+
// "1.31" = ["us-east1", "RAPID"]
4546
//
4647
// Before merge: When adding Kubernetes version 1.{N}, first uncomment the line above, extending
4748
// the infrastructure to 4 versions temporarily. Come back to these instructions after the

cloudbuild.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,15 +271,15 @@ steps:
271271
set -o pipefail
272272
pids=()
273273
cloudProducts=("generic" "gke-autopilot")
274-
declare -A versionsAndRegions=( [1.27]=us-east1 [1.28]=us-west1 [1.29]=europe-west1 )
274+
declare -A versionsAndRegions=( [1.28]=us-west1 [1.29]=europe-west1 [1.30]=asia-east1 )
275275
276276
# Keep in sync with (the inverse of) pkg/util/runtime/features.go:featureDefaults
277277
featureWithGate="PlayerAllocationFilter=true&PlayerTracking=true&CountsAndLists=false&RollingUpdateFix=true&PortRanges=true&PortPolicyNone=true&DisableResyncOnSDKServer=false&AutopilotPassthroughPort=false&Example=true"
278278
featureWithoutGate=""
279279
280280
# Use this if specific feature gates can only be supported on specific Kubernetes versions.
281281
# TODO: When 1.28 becomes trailing version, promote GKEAutopilotExtendedDurationPods to beta.
282-
declare -A featureWithGateByVersion=( [1.27]="${featureWithGate}" [1.28]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true" [1.29]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true")
282+
declare -A featureWithGateByVersion=( [1.28]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true" [1.29]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true" [1.30]="${featureWithGate}&GKEAutopilotExtendedDurationPods=true")
283283
284284
for cloudProduct in ${cloudProducts[@]}
285285
do

examples/cpp-simple/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y \
2222
WORKDIR /project
2323

2424
# Install gRPC and dependencies
25-
RUN git clone --recurse-submodules -b v1.57.1 --depth 1 --shallow-submodules https://github.com/grpc/grpc /var/local/git/grpc && \
25+
RUN git clone --recurse-submodules -b v1.58.3 --depth 1 --shallow-submodules https://github.com/grpc/grpc /var/local/git/grpc && \
2626
cd /var/local/git/grpc && \
2727
mkdir -p cmake/build && \
2828
cd cmake/build && \

examples/cpp-simple/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
3030
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
3131
project_path := $(dir $(mkfile_path))
3232
root_path = $(realpath $(project_path)/../..)
33-
version := 0.17
33+
version := 0.18
3434
ifeq ($(REPOSITORY),)
3535
server_tag := cpp-simple-server:$(version)
3636
else

go.mod

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
fortio.org/fortio v1.3.1
1111
github.com/ahmetb/gen-crd-api-reference-docs v0.3.0
1212
github.com/evanphx/json-patch v4.12.0+incompatible
13-
github.com/fsnotify/fsnotify v1.6.0
13+
github.com/fsnotify/fsnotify v1.7.0
1414
github.com/go-openapi/spec v0.19.5
15-
github.com/google/go-cmp v0.5.9
15+
github.com/google/go-cmp v0.6.0
1616
github.com/google/uuid v1.3.0
17-
github.com/gorilla/websocket v1.4.2
17+
github.com/gorilla/websocket v1.5.0
1818
github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1
1919
github.com/hashicorp/golang-lru v0.5.1
2020
github.com/heptiolabs/healthcheck v0.0.0-20171201210846-da5fdee475fb
@@ -27,7 +27,7 @@ require (
2727
github.com/sirupsen/logrus v1.9.0
2828
github.com/spf13/pflag v1.0.5
2929
github.com/spf13/viper v1.7.0
30-
github.com/stretchr/testify v1.8.2
30+
github.com/stretchr/testify v1.8.4
3131
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
3232
go.opencensus.io v0.24.0
3333
golang.org/x/net v0.23.0
@@ -37,17 +37,17 @@ require (
3737
gomodules.xyz/jsonpatch/v2 v2.4.0
3838
google.golang.org/api v0.138.0
3939
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
40-
google.golang.org/grpc v1.57.1
40+
google.golang.org/grpc v1.58.3
4141
google.golang.org/protobuf v1.33.0
4242
gopkg.in/fsnotify.v1 v1.4.7
4343
gopkg.in/natefinch/lumberjack.v2 v2.2.1
44-
k8s.io/api v0.28.6
45-
k8s.io/apiextensions-apiserver v0.28.6
46-
k8s.io/apimachinery v0.28.6
47-
k8s.io/client-go v0.28.6
48-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
49-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
50-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
44+
k8s.io/api v0.29.7
45+
k8s.io/apiextensions-apiserver v0.29.7
46+
k8s.io/apimachinery v0.29.7
47+
k8s.io/client-go v0.29.7
48+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
49+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
50+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
5151
)
5252

5353
require (
@@ -60,15 +60,15 @@ require (
6060
github.com/beorn7/perks v1.0.1 // indirect
6161
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6262
github.com/davecgh/go-spew v1.1.1 // indirect
63-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
64-
github.com/go-logr/logr v1.2.4 // indirect
63+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
64+
github.com/go-logr/logr v1.3.0 // indirect
6565
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6666
github.com/go-openapi/jsonreference v0.20.2 // indirect
6767
github.com/go-openapi/swag v0.22.3 // indirect
6868
github.com/gogo/protobuf v1.3.2 // indirect
6969
github.com/golang/glog v1.1.0 // indirect
7070
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
71-
github.com/golang/protobuf v1.5.3 // indirect
71+
github.com/golang/protobuf v1.5.4 // indirect
7272
github.com/google/gnostic-models v0.6.8 // indirect
7373
github.com/google/gofuzz v1.2.0 // indirect
7474
github.com/google/s2a-go v0.1.5 // indirect
@@ -109,9 +109,9 @@ require (
109109
gopkg.in/ini.v1 v1.51.0 // indirect
110110
gopkg.in/yaml.v2 v2.4.0 // indirect
111111
gopkg.in/yaml.v3 v3.0.1 // indirect
112-
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
112+
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
113113
k8s.io/klog v1.0.0 // indirect
114-
k8s.io/klog/v2 v2.100.1 // indirect
114+
k8s.io/klog/v2 v2.110.1 // indirect
115115
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
116116
sigs.k8s.io/yaml v1.3.0 // indirect
117117
)

0 commit comments

Comments
 (0)