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

bump k8s dependencies to 1.26.9 #28559

Merged
merged 1 commit into from
Oct 12, 2023
Merged

bump k8s dependencies to 1.26.9 #28559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.26.4
k8s.io/apiextensions-apiserver v0.26.4
k8s.io/apimachinery v0.26.4
k8s.io/client-go v0.26.4
k8s.io/code-generator v0.26.4
k8s.io/api v0.26.9
k8s.io/apiextensions-apiserver v0.26.9
k8s.io/apimachinery v0.26.9
k8s.io/client-go v0.26.9
k8s.io/code-generator v0.26.9
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
Expand Down Expand Up @@ -238,7 +238,7 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.26.4 // indirect
k8s.io/component-base v0.26.9 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/klog v1.0.0 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
Expand All @@ -251,6 +251,10 @@ replace (

go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20220829170633-5d7dfb1129f7

// Using fork of client-go.
// Contains fix for exponential backoff for informers.
k8s.io/client-go => github.com/cilium/client-go v0.26.9-fix

// Using private fork of controller-tools. See commit msg for more context
// as to why we are using a private fork.
sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.6.2
Expand Down
89 changes: 66 additions & 23 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions test/provision/k8s_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ case $K8S_VERSION in
sudo apt-get install -y conntrack
KUBERNETES_CNI_VERSION="1.1.1"
KUBERNETES_CNI_OS="-linux"
K8S_FULL_VERSION="1.24.13"
K8S_FULL_VERSION="1.24.17"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--config=/tmp/config.yaml"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand All @@ -528,7 +528,7 @@ case $K8S_VERSION in
# releases.
# KUBERNETES_CNI_VERSION="0.8.7"
KUBERNETES_CNI_OS="-linux"
K8S_FULL_VERSION="1.25.9"
K8S_FULL_VERSION="1.25.14"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--config=/tmp/config.yaml"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand All @@ -542,7 +542,7 @@ case $K8S_VERSION in
sudo apt-get install -y conntrack
KUBERNETES_CNI_VERSION="1.1.1"
KUBERNETES_CNI_OS="-linux"
K8S_FULL_VERSION="1.26.4"
K8S_FULL_VERSION="1.26.9"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--config=/tmp/config.yaml"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand Down
4 changes: 2 additions & 2 deletions vendor/k8s.io/api/apidiscovery/v2beta1/generated.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/k8s.io/api/apidiscovery/v2beta1/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions vendor/k8s.io/api/batch/v1/generated.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions vendor/k8s.io/api/batch/v1/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/k8s.io/api/batch/v1/types_swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/k8s.io/api/core/v1/generated.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion vendor/k8s.io/api/core/v1/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/k8s.io/apimachinery/pkg/runtime/converter.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions vendor/k8s.io/client-go/discovery/aggregated_discovery.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 43 additions & 21 deletions vendor/k8s.io/client-go/discovery/discovery_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.