Skip to content

Commit

Permalink
vendor: Update k8s dependencies and tests to 1.21.3
Browse files Browse the repository at this point in the history
Also updates the k8s version for other branches to 1.18.20, 1.19.13, and
1.20.9.

Signed-off-by: Chris Tarazi <chris@isovalent.com>
  • Loading branch information
christarazi authored and aanm committed Jul 23, 2021
1 parent fa00a1b commit 059c4f5
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 86 deletions.
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ require (
gopkg.in/ini.v1 v1.62.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.1
k8s.io/apiextensions-apiserver v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/client-go v0.21.1
k8s.io/code-generator v0.21.1
k8s.io/api v0.21.3
k8s.io/apiextensions-apiserver v0.21.3
k8s.io/apimachinery v0.21.3
k8s.io/client-go v0.21.3
k8s.io/code-generator v0.21.3
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
// We specify the controller-tools version here to be the version of the
Expand Down
32 changes: 16 additions & 16 deletions go.sum

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

8 changes: 4 additions & 4 deletions test/provision/k8s_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,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.18.19"
K8S_FULL_VERSION="1.18.20"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--discovery-token-unsafe-skip-ca-verification --ignore-preflight-errors=cri,SystemVerification,swap"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand All @@ -263,7 +263,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.19.11"
K8S_FULL_VERSION="1.19.13"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--discovery-token-unsafe-skip-ca-verification --ignore-preflight-errors=cri,SystemVerification,swap"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand All @@ -277,7 +277,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.20.7"
K8S_FULL_VERSION="1.20.9"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--discovery-token-unsafe-skip-ca-verification --ignore-preflight-errors=cri,SystemVerification,swap"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand All @@ -291,7 +291,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.21.1"
K8S_FULL_VERSION="1.21.3"
KUBEADM_OPTIONS="--ignore-preflight-errors=cri,swap"
KUBEADM_WORKER_OPTIONS="--discovery-token-unsafe-skip-ca-verification --ignore-preflight-errors=cri,SystemVerification,swap"
sudo ln -sf $COREDNS_DEPLOYMENT $DNS_DEPLOYMENT
Expand Down
4 changes: 2 additions & 2 deletions vendor/k8s.io/client-go/tools/cache/reflector.go

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

6 changes: 3 additions & 3 deletions vendor/k8s.io/code-generator/go.mod

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

12 changes: 6 additions & 6 deletions vendor/k8s.io/code-generator/go.sum

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 @@ -931,7 +931,7 @@ gopkg.in/tomb.v1
gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
gopkg.in/yaml.v3
# k8s.io/api v0.21.1
# k8s.io/api v0.21.3
## explicit
k8s.io/api/admissionregistration/v1
k8s.io/api/admissionregistration/v1beta1
Expand Down Expand Up @@ -976,7 +976,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.21.1
# k8s.io/apiextensions-apiserver v0.21.3
## explicit
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
Expand All @@ -989,7 +989,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.21.1
# k8s.io/apimachinery v0.21.3
## explicit
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
Expand Down Expand Up @@ -1035,7 +1035,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.21.1
# k8s.io/client-go v0.21.3
## explicit
k8s.io/client-go/applyconfigurations/admissionregistration/v1
k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1
Expand Down Expand Up @@ -1200,7 +1200,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.21.1
# k8s.io/code-generator v0.21.3
## explicit
k8s.io/code-generator
k8s.io/code-generator/cmd/client-gen
Expand Down Expand Up @@ -1286,7 +1286,7 @@ sigs.k8s.io/controller-tools/pkg/schemapatcher
sigs.k8s.io/controller-tools/pkg/schemapatcher/internal/yaml
sigs.k8s.io/controller-tools/pkg/version
sigs.k8s.io/controller-tools/pkg/webhook
# sigs.k8s.io/structured-merge-diff/v4 v4.1.0
# sigs.k8s.io/structured-merge-diff/v4 v4.1.2
sigs.k8s.io/structured-merge-diff/v4/fieldpath
sigs.k8s.io/structured-merge-diff/v4/schema
sigs.k8s.io/structured-merge-diff/v4/typed
Expand Down

0 comments on commit 059c4f5

Please sign in to comment.