Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Supported Kubernetes to 1.27, 1.28, 1.29 #3654

Merged
merged 21 commits into from
Mar 19, 2024
Merged

Update Supported Kubernetes to 1.27, 1.28, 1.29 #3654

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d4041a2
k8s version update in install and build dir
Kalaiselvi84 Feb 13, 2024
68dedd7
update client-go
Kalaiselvi84 Feb 13, 2024
6383e1e
update CRD API reference
Kalaiselvi84 Feb 13, 2024
fd923d8
Regenerate k8s resource
Kalaiselvi84 Feb 13, 2024
1e699e9
config.toml update
Kalaiselvi84 Feb 14, 2024
a97e850
k8s version update to e2e test cluster creation and update cloudbuild…
Kalaiselvi84 Feb 14, 2024
f03ca90
Rapid for 1.27 and 1.28
Kalaiselvi84 Feb 14, 2024
8df88f3
replace us-central1 to asia-east1
Kalaiselvi84 Feb 15, 2024
c9c048e
region change: us-central1 to asia-east1
Kalaiselvi84 Feb 16, 2024
15a1812
Merge branch 'k8s-1.29.x' of https://github.com/Kalaiselvi84/agones i…
Kalaiselvi84 Feb 16, 2024
5b073c8
change regipn to europe-west1
Kalaiselvi84 Feb 16, 2024
b495409
Merge branch 'main' into k8s-1.29.x
igooch Feb 16, 2024
96e4381
Merge branch 'main' into k8s-1.29.x
igooch Feb 20, 2024
abe7068
Merge branch 'main' into k8s-1.29.x
zmerlynn Feb 21, 2024
0bc5249
Merge branch 'main' into k8s-1.29.x
Kalaiselvi84 Mar 4, 2024
451a20b
Revert "update CRD API reference"
Kalaiselvi84 Mar 18, 2024
dba8fc1
build/Makefile and site/assets/templates/crd-doc-config.json
Kalaiselvi84 Mar 18, 2024
059953c
Merge branch 'main' into k8s-1.29.x
Kalaiselvi84 Mar 18, 2024
8107c8a
make gen-api-docs
Kalaiselvi84 Mar 18, 2024
2cd4566
make gen-crd-client
Kalaiselvi84 Mar 18, 2024
27678df
Merge branch 'main' into k8s-1.29.x
zmerlynn Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 5 additions & 2 deletions build/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,11 @@ gen-install: $(ensure-build-image)

# Generate the client for our CustomResourceDefinition
gen-crd-client: $(ensure-build-image)
docker run --rm $(common_mounts) -w $(workdir_path) $(build_tag) /root/gen-crd-client.sh
docker run --rm $(common_mounts) -w $(workdir_path)/pkg $(build_tag) goimports -w .
docker run --rm $(common_mounts) -w $(workdir_path) $(build_tag) bash -c "\
$(git_safe) && \
git config --global --list && \
/root/gen-crd-client.sh && \
cd /go/src/agones.dev/agones/pkg && goimports -w ."

# Run a bash shell with the developer tools in it. (Creates the image if it doesn't exist)
# Can use DOCKER_RUN_ARGS for extra arguments.
Expand Down
2 changes: 1 addition & 1 deletion build/build-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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
ENV KUBERNETES_VER 1.27.6
ENV KUBERNETES_VER 1.28.6

# 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 Down
2 changes: 1 addition & 1 deletion build/e2e-image/Dockerfile
View file
Open in desktop
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.27.6
ENV KUBECTL_VER 1.28.6
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
View file
Open in desktop
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.27.3 --wait 5m;\
kind create cluster --name $(KIND_PROFILE) --image kindest/node:v1.28.6 --wait 5m;\
fi

# deletes the kind agones cluster
Expand Down
2 changes: 1 addition & 1 deletion build/includes/minikube.mk
View file
Open in desktop
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.27.6 -p $(MINIKUBE_PROFILE) --driver $(MINIKUBE_DRIVER)
$(MINIKUBE) start --kubernetes-version v1.28.6 -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
4 changes: 2 additions & 2 deletions build/terraform/e2e/module.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ variable "kubernetes_versions" {
description = "Create e2e test clusters with these k8s versions in these regions"
type = map(list(string))
default = {
"1.26" = ["asia-east1", "REGULAR"]
"1.27" = ["us-east1", "REGULAR"]
"1.27" = ["us-east1", "RAPID"]
"1.28" = ["us-west1", "RAPID"]
"1.29" = ["us-central1", "RAPID"]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"1.29" = ["us-central1", "RAPID"]
"1.29" = ["asia-east1", "RAPID"]

}
}

Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ steps:
set -o pipefail
pids=()
cloudProducts=("generic" "gke-autopilot")
declare -A versionsAndRegions=( [1.26]=asia-east1 [1.27]=us-east1 [1.28]=us-west1 )
declare -A versionsAndRegions=( [1.27]=us-east1 [1.28]=us-west1 [1.29]=us-central1 )
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
declare -A versionsAndRegions=( [1.27]=us-east1 [1.28]=us-west1 [1.29]=us-central1 )
declare -A versionsAndRegions=( [1.27]=us-east1 [1.28]=us-west1 [1.29]=asia-east1 )

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed the region to asia-east1 for 1.29

for cloudProduct in ${cloudProducts[@]}
do
for version in "${!versionsAndRegions[@]}"
Expand Down
42 changes: 21 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,30 @@ require (
github.com/mitchellh/hashstructure/v2 v2.0.2
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_golang v1.16.0
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.1
github.com/stretchr/testify v1.8.2
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
go.opencensus.io v0.24.0
golang.org/x/net v0.17.0
golang.org/x/net v0.19.0
golang.org/x/oauth2 v0.12.0
golang.org/x/time v0.3.0
golang.org/x/tools v0.13.0
golang.org/x/tools v0.16.1
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/protobuf v1.31.0
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/natefinch/lumberjack.v2 v2.0.0
k8s.io/api v0.27.6
k8s.io/apiextensions-apiserver v0.27.6
k8s.io/apimachinery v0.27.6
k8s.io/client-go v0.27.6
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/utils v0.0.0-20230209194617-a36077c30491
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
)

Expand All @@ -60,16 +60,16 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // 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/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.1.0 // 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
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
Expand All @@ -86,17 +86,17 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
Expand All @@ -110,7 +110,7 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading
Loading