Skip to content

Commit

Permalink
test: update k8s versions to the latest patched releases
Browse files Browse the repository at this point in the history
Also update k8s libraries to v0.24.4

Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm committed Sep 8, 2022
1 parent f67b975 commit 6511bda
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/ini.v1 v1.66.6
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.24.2
k8s.io/apiextensions-apiserver v0.24.2
k8s.io/apimachinery v0.24.2
k8s.io/client-go v0.24.2
k8s.io/code-generator v0.24.2
k8s.io/api v0.24.4
k8s.io/apiextensions-apiserver v0.24.4
k8s.io/apimachinery v0.24.4
k8s.io/client-go v0.24.4
k8s.io/code-generator v0.24.4
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
Expand Down Expand Up @@ -231,7 +231,7 @@ replace (

go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20220713202445-9066eee9e0be

k8s.io/client-go => github.com/cilium/client-go v0.0.0-20220808211112-706606a736d5
k8s.io/client-go => github.com/cilium/client-go v0.0.0-20220819140146-d9df1ee1f047

// Using private fork of controller-tools. See commit msg for more context
// as to why we are using a private fork.
Expand Down
24 changes: 12 additions & 12 deletions go.sum

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

6 changes: 3 additions & 3 deletions test/provision/k8s_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ case $K8S_VERSION in
sudo apt-get install -y conntrack
KUBERNETES_CNI_VERSION="0.8.7"
KUBERNETES_CNI_OS="-linux"
K8S_FULL_VERSION="1.22.11"
K8S_FULL_VERSION="1.22.13"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--token=$TOKEN --discovery-token-unsafe-skip-ca-verification --ignore-preflight-errors=cri,SystemVerification,swap"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand All @@ -437,7 +437,7 @@ case $K8S_VERSION in
sudo apt-get install -y conntrack
KUBERNETES_CNI_VERSION="0.8.7"
KUBERNETES_CNI_OS="-linux"
K8S_FULL_VERSION="1.23.8"
K8S_FULL_VERSION="1.23.10"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--token=$TOKEN --discovery-token-unsafe-skip-ca-verification --ignore-preflight-errors=cri,SystemVerification,swap"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand All @@ -451,7 +451,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.2"
K8S_FULL_VERSION="1.24.4"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--config=/tmp/config.yaml"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand Down
2 changes: 1 addition & 1 deletion vendor/k8s.io/client-go/tools/clientcmd/auth_loaders.go

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

12 changes: 6 additions & 6 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,7 @@ gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.24.2
# k8s.io/api v0.24.4
## explicit; go 1.16
k8s.io/api/admissionregistration/v1
k8s.io/api/admissionregistration/v1beta1
Expand Down Expand Up @@ -1205,7 +1205,7 @@ k8s.io/api/scheduling/v1beta1
k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apiextensions-apiserver v0.24.2
# k8s.io/apiextensions-apiserver v0.24.4
## explicit; go 1.16
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
Expand All @@ -1218,7 +1218,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextension
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1/fake
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake
# k8s.io/apimachinery v0.24.2
# k8s.io/apimachinery v0.24.4
## explicit; go 1.16
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
Expand Down Expand Up @@ -1263,7 +1263,7 @@ k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/json
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/client-go v0.24.2 => github.com/cilium/client-go v0.0.0-20220808211112-706606a736d5
# k8s.io/client-go v0.24.4 => github.com/cilium/client-go v0.0.0-20220819140146-d9df1ee1f047
## explicit; go 1.16
k8s.io/client-go/applyconfigurations/admissionregistration/v1
k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1
Expand Down Expand Up @@ -1538,7 +1538,7 @@ k8s.io/client-go/util/homedir
k8s.io/client-go/util/jsonpath
k8s.io/client-go/util/keyutil
k8s.io/client-go/util/workqueue
# k8s.io/code-generator v0.24.2
# k8s.io/code-generator v0.24.4
## explicit; go 1.16
k8s.io/code-generator
k8s.io/code-generator/cmd/client-gen
Expand Down Expand Up @@ -1659,5 +1659,5 @@ sigs.k8s.io/yaml
# github.com/miekg/dns => github.com/cilium/dns v1.1.4-0.20190417235132-8e25ec9a0ff3
# github.com/optiopay/kafka => github.com/cilium/kafka v0.0.0-20180809090225-01ce283b732b
# go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20220713202445-9066eee9e0be
# k8s.io/client-go => github.com/cilium/client-go v0.0.0-20220808211112-706606a736d5
# k8s.io/client-go => github.com/cilium/client-go v0.0.0-20220819140146-d9df1ee1f047
# sigs.k8s.io/controller-tools => github.com/cilium/controller-tools v0.6.2

0 comments on commit 6511bda

Please sign in to comment.