Skip to content

Commit

Permalink
Update Supported Kubernetes to 1.26, 1.27, 1.28 (#3450)
Browse files Browse the repository at this point in the history
* version update in 12 files before make gen-api-docs

* change in k8s verison from 1.27.7 to 1.27.6 and make gen-api-docs

* make gen-crd-client

* site-config.toml update

* go get k8s.io/[email protected] and go get k8s.io/[email protected]

* update from cluster creation step

* replace PollImmediate with PollUntilContextTimeout in few go files

* more replacement of PollImmediate with PollUntilContextTimeout

* Replaced wait.Poll with wait.PollUntilContextTimeout

* update sdkserver_test.go
  • Loading branch information
Kalaiselvi84 authored Oct 24, 2023
1 parent 4cebbf9 commit ace74f6
Show file tree
Hide file tree
Showing 720 changed files with 44,800 additions and 20,520 deletions.
2 changes: 1 addition & 1 deletion build/build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ENV PATH /usr/local/go/bin:/go/bin:$PATH
RUN go install golang.org/x/tools/cmd/goimports@latest

# the kubernetes version for the file
ENV KUBERNETES_VER 1.26.6
ENV KUBERNETES_VER 1.27.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
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.26.6
ENV KUBECTL_VER 1.27.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
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.26.6 --wait 5m;\
kind create cluster --name $(KIND_PROFILE) --image kindest/node:v1.27.3 --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.26.6 -p $(MINIKUBE_PROFILE) --driver $(MINIKUBE_DRIVER)
$(MINIKUBE) start --kubernetes-version v1.27.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
3 changes: 2 additions & 1 deletion build/terraform/e2e/module.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ variable "kubernetes_versions" {
default = {
"1.25" = ["us-central1", "REGULAR"]
"1.26" = ["asia-east1", "REGULAR"]
"1.27" = ["us-east1", "RAPID"]
"1.27" = ["us-east1", "REGULAR"]
"1.28" = ["us-west1", "RAPID"]
}
}

Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ steps:
set -o pipefail
pids=()
cloudProducts=("generic" "gke-autopilot")
declare -A versionsAndRegions=( [1.25]=us-central1 [1.26]=asia-east1 [1.27]=us-east1 )
declare -A versionsAndRegions=( [1.26]=asia-east1 [1.27]=us-east1 [1.28]=us-west1 )
for cloudProduct in ${cloudProducts[@]}
do
for version in "${!versionsAndRegions[@]}"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ping/udp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func TestUDPServerHealth(t *testing.T) {

cancel()

err = wait.PollImmediate(time.Second, 5*time.Second, func() (done bool, err error) {
err = wait.PollUntilContextTimeout(context.Background(), time.Second, 5*time.Second, true, func(ctx context.Context) (bool, error) {
return u.Health() != nil, nil
})

Expand Down
27 changes: 13 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.8.1
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802
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/oauth2 v0.12.0
Expand All @@ -39,12 +39,13 @@ require (
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.26.6
k8s.io/apiextensions-apiserver v0.26.6
k8s.io/apimachinery v0.26.6
k8s.io/client-go v0.26.6
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
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
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
)

require (
Expand All @@ -60,9 +61,9 @@ require (
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-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // 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
Expand All @@ -78,7 +79,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -88,7 +89,6 @@ require (
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/rogpeppe/go-internal v1.11.0 // 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
Expand All @@ -111,7 +111,6 @@ require (
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit ace74f6

Please sign in to comment.