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

Update dependencies to kubernetes 1.23 #4567

Merged
merged 6 commits into from
Dec 28, 2021
+130,733 −24,162
Merged

Update dependencies to kubernetes 1.23 #4567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d56624c
Update golang to 1.17.5
MaciekPytel Dec 28, 2021
c64b9b4
Update dependencies to kubernetes 1.23
MaciekPytel Dec 28, 2021
1277d7e
Update import paths to clock utils library
MaciekPytel Dec 28, 2021
834f58a
Add go:build tags matching existing +build tags
MaciekPytel Dec 28, 2021
adccf62
Update boilerplate check to allow new go:build syntax
MaciekPytel Dec 28, 2021
b73124d
Update github unittest checks to use go1.17
MaciekPytel Dec 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <mwielgus@google.com>"

ENV GOPATH /gopath/
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/aws/ec2_instance_types/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore

/*
Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/cloudprovider/aws/instance_type_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cluster-autoscaler/cloudprovider/aws/instance_type_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/azure/azure_instance_types/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_alicloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build alicloud
// +build alicloud

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_all.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build aws
// +build aws

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build azure
// +build azure

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_baiducloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build baiducloud
// +build baiducloud

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_bizflycloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build bizflycloud
// +build bizflycloud

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_brightbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build brightbox
// +build brightbox

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_cloudstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build cloudstack
// +build cloudstack

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_clusterapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build clusterapi
// +build clusterapi

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_digitalocean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build digitalocean
// +build digitalocean

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_exoscale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build exoscale
// +build exoscale

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build gce
// +build gce

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_hetzner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build hetzner
// +build hetzner

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_huaweicloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build huaweicloud
// +build huaweicloud

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_ionoscloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build ionoscloud
// +build ionoscloud

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_kubemark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build kubemark
// +build kubemark

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_linode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linode
// +build linode

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_magnum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build magnum
// +build magnum

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build exoscale
// +build exoscale

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/builder/builder_packet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build packet
// +build packet

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/kubemark/kubemark_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

/*
Expand Down
1 change: 1 addition & 0 deletions cluster-autoscaler/cloudprovider/kubemark/kubemark_other.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

/*
Expand Down
80 changes: 40 additions & 40 deletions cluster-autoscaler/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand All @@ -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
Loading