Merge pull request #4567 from MaciekPytel/ca_1_23_deps

Update dependencies to kubernetes 1.23
kubernetes · Dec 28, 2021 · b938b4c · b938b4c
2 parents 6d19e3d + b73124d
commit b938b4c
Show file tree

Hide file tree

Showing 1,938 changed files with 130,733 additions and 24,162 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17.5
 
       - uses: actions/checkout@v2
         with:

diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16
+FROM golang:1.17.5
 LABEL maintainer="Marcin Wielgus <[email protected]>"
 
 ENV GOPATH /gopath/

diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/aws/instance_type_cache.go b/cluster-autoscaler/cloudprovider/aws/instance_type_cache.go
@@ -20,9 +20,9 @@ import (
 	"sync"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/clock"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/clock"
 )
 
 const (

diff --git a/cluster-autoscaler/cloudprovider/aws/instance_type_cache_test.go b/cluster-autoscaler/cloudprovider/aws/instance_type_cache_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"k8s.io/apimachinery/pkg/util/clock"
 	"k8s.io/client-go/tools/cache"
+	test_clock "k8s.io/utils/clock/testing"
 )
 
 func TestInstanceTypeCache(t *testing.T) {
@@ -64,7 +64,7 @@ func TestLTVersionChange(t *testing.T) {
 		})
 	}
 
-	fakeClock := clock.NewFakeClock(time.Unix(0, 0))
+	fakeClock := test_clock.NewFakeClock(time.Unix(0, 0))
 	fakeStore := cache.NewFakeExpirationStore(
 		func(obj interface{}) (s string, e error) {
 			return obj.(instanceTypeCachedObject).name, nil

diff --git a/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go b/cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_alicloud.go b/cluster-autoscaler/cloudprovider/builder/builder_alicloud.go
@@ -1,3 +1,4 @@
+//go:build alicloud
 // +build alicloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_all.go b/cluster-autoscaler/cloudprovider/builder/builder_all.go
@@ -1,3 +1,4 @@
+//go:build !gce && !aws && !azure && !kubemark && !alicloud && !magnum && !digitalocean && !clusterapi && !huaweicloud && !ionoscloud && !linode && !hetzner && !bizflycloud && !brightbox && !packet
 // +build !gce,!aws,!azure,!kubemark,!alicloud,!magnum,!digitalocean,!clusterapi,!huaweicloud,!ionoscloud,!linode,!hetzner,!bizflycloud,!brightbox,!packet
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_aws.go b/cluster-autoscaler/cloudprovider/builder/builder_aws.go
@@ -1,3 +1,4 @@
+//go:build aws
 // +build aws
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_azure.go b/cluster-autoscaler/cloudprovider/builder/builder_azure.go
@@ -1,3 +1,4 @@
+//go:build azure
 // +build azure
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go b/cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go
@@ -1,3 +1,4 @@
+//go:build baiducloud
 // +build baiducloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go b/cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go
@@ -1,3 +1,4 @@
+//go:build bizflycloud
 // +build bizflycloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_brightbox.go b/cluster-autoscaler/cloudprovider/builder/builder_brightbox.go
@@ -1,3 +1,4 @@
+//go:build brightbox
 // +build brightbox
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go b/cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go
@@ -1,3 +1,4 @@
+//go:build cloudstack
 // +build cloudstack
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go b/cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go
@@ -1,3 +1,4 @@
+//go:build clusterapi
 // +build clusterapi
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go b/cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go
@@ -1,3 +1,4 @@
+//go:build digitalocean
 // +build digitalocean
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_exoscale.go b/cluster-autoscaler/cloudprovider/builder/builder_exoscale.go
@@ -1,3 +1,4 @@
+//go:build exoscale
 // +build exoscale
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_gce.go b/cluster-autoscaler/cloudprovider/builder/builder_gce.go
@@ -1,3 +1,4 @@
+//go:build gce
 // +build gce
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_hetzner.go b/cluster-autoscaler/cloudprovider/builder/builder_hetzner.go
@@ -1,3 +1,4 @@
+//go:build hetzner
 // +build hetzner
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go b/cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go
@@ -1,3 +1,4 @@
+//go:build huaweicloud
 // +build huaweicloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go b/cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go
@@ -1,3 +1,4 @@
+//go:build ionoscloud
 // +build ionoscloud
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_kubemark.go b/cluster-autoscaler/cloudprovider/builder/builder_kubemark.go
@@ -1,3 +1,4 @@
+//go:build kubemark
 // +build kubemark
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_linode.go b/cluster-autoscaler/cloudprovider/builder/builder_linode.go
@@ -1,3 +1,4 @@
+//go:build linode
 // +build linode
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_magnum.go b/cluster-autoscaler/cloudprovider/builder/builder_magnum.go
@@ -1,3 +1,4 @@
+//go:build magnum
 // +build magnum
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go b/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go
@@ -1,3 +1,4 @@
+//go:build exoscale
 // +build exoscale
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/builder/builder_packet.go b/cluster-autoscaler/cloudprovider/builder/builder_packet.go
@@ -1,3 +1,4 @@
+//go:build packet
 // +build packet
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go b/cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

diff --git a/cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go b/cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*

diff --git a/cluster-autoscaler/go.mod b/cluster-autoscaler/go.mod
@@ -16,29 +16,29 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.1.2
 	github.com/jmespath/go-jmespath v0.4.0
-	github.com/json-iterator/go v1.1.11
+	github.com/json-iterator/go v1.1.12
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/satori/go.uuid v1.2.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
-	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
 	google.golang.org/api v0.46.0
 	gopkg.in/gcfg.v1 v1.2.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.23.0-alpha.1
-	k8s.io/apimachinery v0.23.0-alpha.1
-	k8s.io/apiserver v0.23.0-alpha.1
-	k8s.io/client-go v0.23.0-alpha.1
-	k8s.io/cloud-provider v0.23.0-alpha.1
-	k8s.io/component-base v0.23.0-alpha.1
-	k8s.io/component-helpers v0.23.0-alpha.1
-	k8s.io/klog/v2 v2.10.0
+	k8s.io/api v0.23.0
+	k8s.io/apimachinery v0.23.0
+	k8s.io/apiserver v0.23.0
+	k8s.io/client-go v0.23.0
+	k8s.io/cloud-provider v0.23.0
+	k8s.io/component-base v0.23.0
+	k8s.io/component-helpers v0.23.0
+	k8s.io/klog/v2 v2.30.0
 	k8s.io/kubelet v0.0.0
-	k8s.io/kubernetes v1.23.0-alpha.1
+	k8s.io/kubernetes v1.23.0
 	k8s.io/legacy-cloud-providers v0.0.0
-	k8s.io/utils v0.0.0-20210802155522-efc7438f0176
+	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
 	sigs.k8s.io/cloud-provider-azure v1.1.3
 )
 
@@ -48,56 +48,56 @@ replace github.com/digitalocean/godo => github.com/digitalocean/godo v1.27.0
 
 replace github.com/rancher/go-rancher => github.com/rancher/go-rancher v0.1.0
 
-replace k8s.io/api => k8s.io/api v0.23.0-alpha.1
+replace k8s.io/api => k8s.io/api v0.23.0
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0-alpha.1
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.23.0-alpha.1
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.23.1-rc.0
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.23.0-alpha.1
+replace k8s.io/apiserver => k8s.io/apiserver v0.23.0
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.0-alpha.1
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.0
 
-replace k8s.io/client-go => k8s.io/client-go v0.23.0-alpha.1
+replace k8s.io/client-go => k8s.io/client-go v0.23.0
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.0-alpha.1
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.0
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.0-alpha.1
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.0
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.23.0-alpha.1
+replace k8s.io/code-generator => k8s.io/code-generator v0.23.1-rc.0
 
-replace k8s.io/component-base => k8s.io/component-base v0.23.0-alpha.1
+replace k8s.io/component-base => k8s.io/component-base v0.23.0
 
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.23.0-alpha.1
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.23.0
 
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.23.0-alpha.1
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.23.0
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.23.0-alpha.1
+replace k8s.io/cri-api => k8s.io/cri-api v0.23.1-rc.0
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.0-alpha.1
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.0
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.0-alpha.1
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.0
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.0-alpha.1
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.0
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.0-alpha.1
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.0
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.0-alpha.1
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.0
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.23.0-alpha.1
+replace k8s.io/kubectl => k8s.io/kubectl v0.23.0
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.23.0-alpha.1
+replace k8s.io/kubelet => k8s.io/kubelet v0.23.0
 
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.0-alpha.1
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.0
 
-replace k8s.io/metrics => k8s.io/metrics v0.23.0-alpha.1
+replace k8s.io/metrics => k8s.io/metrics v0.23.0
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.23.0-alpha.1
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.23.2-rc.0
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.0-alpha.1
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.0
 
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.0-alpha.1
+replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.0
 
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.23.0-alpha.1
+replace k8s.io/sample-controller => k8s.io/sample-controller v0.23.0
 
-replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.0-alpha.1
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.0