Skip to content

Commit

Permalink
vendor: Update k8s dependencies and tests to 1.22.0-rc.0
Browse files Browse the repository at this point in the history
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
  • Loading branch information
nathanjsweet committed Oct 25, 2021
1 parent 0ed674e commit 73ba07f
Show file tree
Hide file tree
Showing 413 changed files with 20,726 additions and 8,915 deletions.
2 changes: 1 addition & 1 deletion contrib/vagrant/deployments/coredns-cm.yaml.sed
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# File source
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.21/cluster/addons/dns/coredns/coredns.yaml.base
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.22/cluster/addons/dns/coredns/coredns.yaml.base

apiVersion: v1
kind: ConfigMap
Expand Down
2 changes: 1 addition & 1 deletion contrib/vagrant/deployments/coredns-controller.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# File source
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.21/cluster/addons/dns/coredns/coredns.yaml.base
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.22/cluster/addons/dns/coredns/coredns.yaml.base
# __MACHINE_GENERATED_WARNING__

apiVersion: apps/v1
Expand Down
2 changes: 1 addition & 1 deletion contrib/vagrant/deployments/coredns-sa.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# File source
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.21/cluster/addons/dns/coredns/coredns.yaml.base
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.22/cluster/addons/dns/coredns/coredns.yaml.base
---
apiVersion: v1
kind: ServiceAccount
Expand Down
2 changes: 1 addition & 1 deletion contrib/vagrant/deployments/coredns-svc.yaml.sed
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# File source
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.21/cluster/addons/dns/coredns/coredns.yaml.base
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.22/cluster/addons/dns/coredns/coredns.yaml.base

apiVersion: v1
kind: Service
Expand Down
1 change: 0 additions & 1 deletion contrib/vagrant/scripts/02-install-kubernetes-master.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ ExecStart=/usr/bin/kube-apiserver \\
--kubelet-certificate-authority='/var/lib/kubernetes/ca-kubelet.pem' \\
--kubelet-client-certificate='/var/lib/kubernetes/k8s-api-server.pem' \\
--kubelet-client-key='/var/lib/kubernetes/k8s-api-server-key.pem' \\
--kubelet-https \\
--service-account-issuer='api' \\
--service-account-signing-key-file='/var/lib/kubernetes/k8s-controller-manager-sa-key.pem' \\
--service-account-key-file='/var/lib/kubernetes/k8s-controller-manager-sa-key.pem' \\
Expand Down
2 changes: 1 addition & 1 deletion contrib/vagrant/scripts/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ cluster_dns_ipv6=${K8S_CLUSTER_DNS_IPV6:-"FD03::A"}
cluster_api_server_ipv4=${K8S_CLUSTER_API_SERVER_IPV4:-"172.20.0.1"}
cluster_api_server_ipv6=${K8S_CLUSTER_API_SERVER_IPV6:-"FD03::1"}

k8s_version="v1.21.0"
k8s_version="v1.22.0"
etcd_version="v3.4.16"

function restore_flag {
Expand Down
32 changes: 16 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.17
// direct dependencies
require (
github.com/Azure/azure-sdk-for-go v54.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.17
github.com/Azure/go-autorest/autorest v0.11.18
github.com/Azure/go-autorest/autorest/adal v0.9.13
github.com/Azure/go-autorest/autorest/azure/auth v0.5.7
github.com/Azure/go-autorest/autorest/to v0.4.0
Expand Down Expand Up @@ -41,7 +41,7 @@ require (
github.com/go-openapi/swag v0.19.15
github.com/go-openapi/validate v0.20.2
github.com/gogo/protobuf v1.3.2
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.6
github.com/google/gopacket v1.1.19
Expand Down Expand Up @@ -73,7 +73,7 @@ require (
github.com/sasha-s/go-deadlock v0.3.1
github.com/servak/go-fastping v0.0.0-20160802140958-5718d12e20a0
github.com/shirou/gopsutil/v3 v3.21.7
github.com/sirupsen/logrus v1.7.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.8.1
Expand All @@ -87,10 +87,10 @@ require (
go.uber.org/goleak v1.1.10
go.universe.tf/metallb v0.10.0
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e
golang.org/x/net v0.0.0-20210504132125-bbd867fde50d
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
golang.org/x/tools v0.1.5
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210506160403-92e472f520a5
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
Expand All @@ -100,13 +100,13 @@ 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.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
k8s.io/api v0.22.0
k8s.io/apiextensions-apiserver v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/client-go v0.22.0
k8s.io/code-generator v0.22.0
k8s.io/klog/v2 v2.9.0
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
// We specify the controller-tools version here to be the version of the
// fork below, so that when we generate CRDs, the generated CRD contains
// version number of the tool. We want the version number to match up with
Expand Down Expand Up @@ -142,9 +142,9 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/envoyproxy/protoc-gen-validate v0.4.2-0.20210105193028-872b28c45782 // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/go-logr/logr v0.4.0 // indirect
Expand All @@ -156,7 +156,7 @@ require (
github.com/gobuffalo/flect v0.2.3 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.4.1 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-hclog v0.12.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
Expand Down Expand Up @@ -217,7 +217,7 @@ require (
gotest.tools v2.2.0+incompatible // indirect
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
)

Expand Down

0 comments on commit 73ba07f

Please sign in to comment.