Skip to content

Commit

Permalink
Sync upstream until 1.26.2 (#212)
Browse files Browse the repository at this point in the history 
* Move PredicateChecker initialization before processors initialization

* Cluster Autoscaler 1.26.1

* update vendor to v1.26.1 due to kubernetes#5372

* baseURI for skuClient based on cloud

* Update go version to 1.19.7

This is following-up on Kubernetes 1.26 bumping the go version.

* Update vendor to kubernetes 1.26.3

Also updated CA version to 1.26.2

* revendored with ./hack/update-vendor.sh 1.26.1

* back to ./hack/update-vendor.sh 1.26.3 after IT success

* const ClusterAutoscalerVersion = "1.26.1

* mod sync_changes mentioning k8s.io pkg upgrades

---------

Co-authored-by: Bartłomiej Wróblewski <[email protected]>
Co-authored-by: Kubernetes Prow Robot <[email protected]>
Co-authored-by: Kuba Tużnik <[email protected]>
Co-authored-by: Jayant Jain <[email protected]>
Co-authored-by: Prachi Gandhi <[email protected]>
Co-authored-by: Maciek Pytel <[email protected]>
  • Loading branch information
@elankath @BigDarkClown
@k8s-ci-robot @towca @jayantjain93 @gandhipr @MaciekPytel
7 people authored Apr 13, 2023
1 parent eff68de commit ac0a14a
Show file tree
Hide file tree
Showing 161 changed files with 5,256 additions and 1,866 deletions.
2 changes: 1 addition & 1 deletion builder/Dockerfile
View file
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.19
FROM golang:1.19.7
LABEL maintainer="Marcin Wielgus <[email protected]>"

ENV GOPATH /gopath/
Expand Down
2 changes: 1 addition & 1 deletion cluster-autoscaler/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############# builder #############
FROM golang:1.19.5 AS builder
FROM golang:1.19.7 AS builder

WORKDIR /go/src/github.com/gardener/autoscaler
COPY . .
Expand Down
12 changes: 11 additions & 1 deletion cluster-autoscaler/SYNC-CHANGES/SYNC_CHANGES-1.26.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,22 @@

## Synced with which upstream CA

[v1.26.1](https://github.com/kubernetes/autoscaler/tree/cluster-autoscaler-1.26.1/cluster-autoscaler)
[v1.26.2](https://github.com/kubernetes/autoscaler/tree/cluster-autoscaler-1.26.2/cluster-autoscaler)

## Changes made
- See general release notes of 1.26.2: https://github.com/kubernetes/autoscaler/releases/tag/cluster-autoscaler-1.26.2
- See general release notes of 1.26.1: https://github.com/kubernetes/autoscaler/releases/tag/cluster-autoscaler-1.26.1

### During merging
- k8s.io/api v0.26.0 -> v0.26.3
- k8s.io/apimachinery v0.26.0 -> v0.26.3
- k8s.io/apiserver v0.26.0 -> v0.26.3
- k8s.io/client-go v0.26.0 -> v0.26.3
- k8s.io/cloud-provider v0.26.0 -> v0.26.3
- k8s.io/component-base v0.26.0 -> v0.26.3
- k8s.io/component-helpers v0.26.0 -> v0.26.3
- k8s.io/kubelet v0.26.0 -> v0.26.3
- k8s.io/kubernetes v1.26.0 -> v1.26.3

### During vendoring k8s
- mcm v0.48.1 -> 0.48.2
Expand Down
4 changes: 3 additions & 1 deletion cluster-autoscaler/cloudprovider/azure/azure_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,9 @@ func newAzClient(cfg *Config, env *azure.Environment) (*azClient, error) {
kubernetesServicesClient := containerserviceclient.New(aksClientConfig)
klog.V(5).Infof("Created kubernetes services client with authorizer: %v", kubernetesServicesClient)

skuClient := compute.NewResourceSkusClient(cfg.SubscriptionID)
// Reference on why selecting ResourceManagerEndpoint as baseURI -
// https://github.com/Azure/go-autorest/blob/main/autorest/azure/environments.go
skuClient := compute.NewResourceSkusClientWithBaseURI(azClientConfig.ResourceManagerEndpoint, cfg.SubscriptionID)
skuClient.Authorizer = azClientConfig.Authorizer
klog.V(5).Infof("Created sku client with authorizer: %v", skuClient)

Expand Down
92 changes: 46 additions & 46 deletions cluster-autoscaler/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.0
golang.org/x/crypto v0.1.0
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
golang.org/x/net v0.7.0
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
google.golang.org/api v0.60.0
google.golang.org/grpc v1.49.0
google.golang.org/protobuf v1.28.1
gopkg.in/gcfg.v1 v1.2.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.26.0
k8s.io/apimachinery v0.26.0
k8s.io/apiserver v0.26.0
k8s.io/client-go v0.26.0
k8s.io/cloud-provider v0.26.0
k8s.io/component-base v0.26.0
k8s.io/component-helpers v0.26.0
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/apiserver v0.26.3
k8s.io/client-go v0.26.3
k8s.io/cloud-provider v0.26.3
k8s.io/component-base v0.26.3
k8s.io/component-helpers v0.26.3
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.80.1
k8s.io/kubelet v0.26.0
k8s.io/kubernetes v1.26.0
k8s.io/kubelet v0.26.3
k8s.io/kubernetes v1.26.3
k8s.io/legacy-cloud-providers v0.0.0
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
sigs.k8s.io/cloud-provider-azure v1.24.2
Expand Down Expand Up @@ -102,7 +102,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/cadvisor v0.46.0 // indirect
github.com/google/cel-go v0.12.5 // indirect
github.com/google/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
Expand Down Expand Up @@ -166,9 +166,9 @@ require (
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
Expand All @@ -178,15 +178,15 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/cri-api v0.0.0 // indirect
k8s.io/csi-translation-lib v0.26.0 // indirect
k8s.io/csi-translation-lib v0.26.3 // indirect
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
k8s.io/kms v0.26.0 // indirect
k8s.io/kms v0.26.3 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/kube-proxy v0.0.0 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/mount-utils v0.26.0-alpha.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand All @@ -198,60 +198,60 @@ 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.26.0
replace k8s.io/api => k8s.io/api v0.26.3

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3

replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.1-rc.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.3

replace k8s.io/apiserver => k8s.io/apiserver v0.26.0
replace k8s.io/apiserver => k8s.io/apiserver v0.26.3

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.0
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.3

replace k8s.io/client-go => k8s.io/client-go v0.26.0
replace k8s.io/client-go => k8s.io/client-go v0.26.3

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.0
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.3

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.0
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.3

replace k8s.io/code-generator => k8s.io/code-generator v0.26.2-rc.0
replace k8s.io/code-generator => k8s.io/code-generator v0.26.3

replace k8s.io/component-base => k8s.io/component-base v0.26.0
replace k8s.io/component-base => k8s.io/component-base v0.26.3

replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.0
replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.3

replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.0
replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.3

replace k8s.io/cri-api => k8s.io/cri-api v0.26.2-rc.0
replace k8s.io/cri-api => k8s.io/cri-api v0.26.3

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.0
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.3

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.0
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.3

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.0
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.3

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.0
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.3

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.0
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.3

replace k8s.io/kubectl => k8s.io/kubectl v0.26.0
replace k8s.io/kubectl => k8s.io/kubectl v0.26.3

replace k8s.io/kubelet => k8s.io/kubelet v0.26.0
replace k8s.io/kubelet => k8s.io/kubelet v0.26.3

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.0
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.3

replace k8s.io/metrics => k8s.io/metrics v0.26.0
replace k8s.io/metrics => k8s.io/metrics v0.26.3

replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.2-rc.0
replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.3

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.0
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.3

replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.0
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.3

replace k8s.io/sample-controller => k8s.io/sample-controller v0.26.0
replace k8s.io/sample-controller => k8s.io/sample-controller v0.26.3

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.0
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.3

replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.0
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.3

replace k8s.io/kms => k8s.io/kms v0.26.2-rc.0
replace k8s.io/kms => k8s.io/kms v0.26.3
Loading

0 comments on commit ac0a14a

Please sign in to comment.