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

Jump to bottom

Update Kubernetes dependencies to 1.22.0 #12101

Merged
merged 2 commits into from
Aug 5, 2021
Merged

Update Kubernetes dependencies to 1.22.0 #12101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
832e773
Update Kubernetes dependencies to 1.22.0
johngmyers Aug 4, 2021
5575914
make apimachinery
johngmyers Aug 5, 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
  •  
  •  
  •  
70 changes: 35 additions & 35 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,42 @@ module k8s.io/kops

go 1.16

// Version kubernetes-1.21.3 => tag v0.21.3
// Version kubernetes-1.22.0 => tag v0.22.0

// This should match hack/go.mod
replace k8s.io/code-generator => k8s.io/code-generator v0.21.3
replace k8s.io/code-generator => k8s.io/code-generator v0.22.0

replace (
k8s.io/api => k8s.io/api v0.21.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.3
k8s.io/apimachinery => k8s.io/apimachinery v0.21.3
k8s.io/apiserver => k8s.io/apiserver v0.21.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.3
k8s.io/client-go => k8s.io/client-go v0.21.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.3
k8s.io/component-base => k8s.io/component-base v0.21.3
k8s.io/component-helpers => k8s.io/component-helpers v0.21.3
k8s.io/controller-manager => k8s.io/controller-manager v0.21.3
k8s.io/cri-api => k8s.io/cri-api v0.21.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.3
k8s.io/kubectl => k8s.io/kubectl v0.21.3
k8s.io/kubelet => k8s.io/kubelet v0.21.3
k8s.io/api => k8s.io/api v0.22.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.0
k8s.io/apimachinery => k8s.io/apimachinery v0.22.0
k8s.io/apiserver => k8s.io/apiserver v0.22.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.0
k8s.io/client-go => k8s.io/client-go v0.22.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.0
k8s.io/component-base => k8s.io/component-base v0.22.0
k8s.io/component-helpers => k8s.io/component-helpers v0.22.0
k8s.io/controller-manager => k8s.io/controller-manager v0.22.0
k8s.io/cri-api => k8s.io/cri-api v0.22.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.0
k8s.io/kubectl => k8s.io/kubectl v0.22.0
k8s.io/kubelet => k8s.io/kubelet v0.22.0
k8s.io/kubernetes => k8s.io/kubernetes v1.21.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.3
k8s.io/metrics => k8s.io/metrics v0.21.3
k8s.io/mount-utils => k8s.io/mount-utils v0.21.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.0
k8s.io/metrics => k8s.io/metrics v0.22.0
k8s.io/mount-utils => k8s.io/mount-utils v0.22.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.0
)

require (
cloud.google.com/go v0.81.0
github.com/Azure/azure-pipeline-go v0.2.3
github.com/Azure/azure-sdk-for-go v53.4.0+incompatible
github.com/Azure/azure-sdk-for-go v55.0.0+incompatible
github.com/Azure/azure-storage-blob-go v0.13.0
github.com/Azure/go-autorest/autorest v0.11.18
github.com/Azure/go-autorest/autorest/azure/auth v0.5.7
Expand Down Expand Up @@ -84,17 +84,17 @@ require (
gopkg.in/inf.v0 v0.9.1
gopkg.in/square/go-jose.v2 v2.5.1
helm.sh/helm/v3 v3.6.1
k8s.io/api v0.21.3
k8s.io/apimachinery v0.21.3
k8s.io/cli-runtime v0.21.3
k8s.io/client-go v0.21.3
k8s.io/api v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/cli-runtime v0.22.0
k8s.io/client-go v0.22.0
k8s.io/cloud-provider-openstack v1.21.1
k8s.io/component-base v0.21.3
k8s.io/component-base v0.22.0
k8s.io/gengo v0.0.0-20210203185629-de9496dff47b
k8s.io/klog/v2 v2.8.0
k8s.io/kubectl v0.21.3
k8s.io/legacy-cloud-providers v0.21.3
k8s.io/mount-utils v0.21.3
k8s.io/klog/v2 v2.9.0
k8s.io/kubectl v0.22.0
k8s.io/legacy-cloud-providers v0.22.0
k8s.io/mount-utils v0.22.0
k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471
rsc.io/letsencrypt v0.0.3 // indirect
sigs.k8s.io/controller-runtime v0.9.5
Expand Down
224 changes: 110 additions & 114 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hack/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ require (
github.com/bazelbuild/bazel-gazelle v0.23.0
github.com/bazelbuild/bazelisk v1.7.5
github.com/client9/misspell v0.3.4
golang.org/x/tools v0.1.0
golang.org/x/tools v0.1.2
honnef.co/go/tools v0.1.3
k8s.io/code-generator v0.21.0
k8s.io/code-generator v0.22.0
sigs.k8s.io/controller-tools v0.5.0
)
80 changes: 53 additions & 27 deletions hack/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion pkg/client/clientset_generated/clientset/fake/clientset_generated.go
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions tests/e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/octago/sflags v0.2.0
github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v2 v2.4.0
k8s.io/apimachinery v0.21.3
k8s.io/klog/v2 v2.8.0
k8s.io/apimachinery v0.22.0
k8s.io/klog/v2 v2.9.0
k8s.io/kops v0.0.0-00010101000000-000000000000
sigs.k8s.io/boskos v0.0.0-20200710214748-f5935686c7fc
sigs.k8s.io/kubetest2 v0.0.0-20210423234514-1c731a5d2283
Expand Down
5 changes: 3 additions & 2 deletions tests/e2e/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
github.com/Azure/azure-sdk-for-go v42.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v46.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v53.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v55.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0=
github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0=
github.com/Azure/azure-storage-blob-go v0.13.0 h1:lgWHvFh+UYBNVQLFHXkvul2f6yOPA9PIH82RTG2cSwc=
Expand Down Expand Up @@ -2207,8 +2207,9 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-aggregator v0.21.0/go.mod h1:sIaa9L4QCBo9gjPyoGJns4cBjYVLq3s49FxF7m/1A0A=
k8s.io/kube-controller-manager v0.21.0/go.mod h1:QGJ1P7eU4FQq8evpCHN5e4QwPpcr2sbWFJBO/DKBUrw=
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/azure/resourcegroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (c *resourceGroupsClientImpl) List(ctx context.Context, filter string) ([]r
}

func (c *resourceGroupsClientImpl) Delete(ctx context.Context, name string) error {
future, err := c.c.Delete(ctx, name)
future, err := c.c.Delete(ctx, name, "")
if err != nil {
return fmt.Errorf("error deleting resource group: %s", err)
}
Expand Down
48 changes: 48 additions & 0 deletions ...om/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute/CHANGELOG.md
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute/_meta.json
View file
Open in desktop

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

Loading