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 google.golang.org/api to v0.46.0 #262

Merged
merged 6 commits into from
Aug 19, 2021
Merged

Update google.golang.org/api to v0.46.0 #262

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
de861a6
Update google.golang.org/api in go.mod and providers/go.mod to v0.46.0
Aug 12, 2021
20aab14
Run ./tools/update_vendor.sh
Aug 18, 2021
eadfe86
Pass nil as time duration to the RequestCertificate function
Aug 18, 2021
c670c4a
Update GoogleCloudPlatform/k8s-cloud-provider module to v1.16.1-0.202…
Aug 18, 2021
00a2e7f
Run ./tools/update_vendor.sh
Aug 18, 2021
2388e1a
Update tests to work with the new version of k8s-cloud-providers
Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion cmd/gke-exec-auth-plugin/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func processCSR(client clientset.Interface, privateKeyData []byte, hostname stri
apicertificates.UsageClientAuth,
}
name := digestedName(privateKeyData, subject, usages)
reqName, reqUID, err := csr.RequestCertificate(client, csrData, name, apicertificates.KubeAPIServerClientKubeletSignerName, usages, privateKey)
reqName, reqUID, err := csr.RequestCertificate(client, csrData, name, apicertificates.KubeAPIServerClientKubeletSignerName, nil, usages, privateKey)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikedanese is a nil request duration the desired param value?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

if err != nil {
return nil, err
}
Expand Down
98 changes: 47 additions & 51 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ module k8s.io/cloud-provider-gcp
go 1.16

require (
cloud.google.com/go v0.75.0
cloud.google.com/go v0.81.0
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/go-openapi/spec v0.19.6 // indirect
github.com/go-openapi/swag v0.19.7 // indirect
github.com/gofrs/flock v0.7.1
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.4
github.com/google/go-cmp v0.5.5
github.com/google/go-tpm v0.2.0
github.com/google/uuid v1.1.4 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
Expand All @@ -18,34 +17,30 @@ require (
github.com/onsi/ginkgo v1.14.1 // indirect
github.com/onsi/gomega v1.10.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_model v0.2.0 // indirect
github.com/spf13/cobra v1.1.1
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 // indirect
go.uber.org/zap v1.14.1 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
golang.org/x/oauth2 v0.0.0-20210112200429-01de73cf58bd
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
google.golang.org/api v0.36.0
google.golang.org/genproto v0.0.0-20210111234610-22ae2b108f89 // indirect
google.golang.org/grpc v1.34.0 // indirect
golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c
google.golang.org/api v0.46.0
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
gopkg.in/gcfg.v1 v1.2.0
gopkg.in/warnings.v0 v0.1.2
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/apiserver v0.21.0
k8s.io/api v0.22.0
k8s.io/apimachinery v0.22.0
k8s.io/apiserver v0.22.0
k8s.io/client-go v9.0.0+incompatible
k8s.io/cloud-provider v0.21.0
k8s.io/cloud-provider v0.22.0
k8s.io/cloud-provider-gcp/providers v0.0.0
k8s.io/component-base v0.21.0
k8s.io/controller-manager v0.21.0
k8s.io/klog/v2 v2.8.0
k8s.io/kubelet v0.21.0
k8s.io/kubernetes v1.21.0
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
k8s.io/component-base v0.22.0
k8s.io/controller-manager v0.22.0
k8s.io/klog/v2 v2.9.0
k8s.io/kubelet v0.22.0
k8s.io/kubernetes v1.22.0
sigs.k8s.io/kubetest2 v0.0.0-20210423234514-1c731a5d2283 // indirect
)

Expand All @@ -63,44 +58,45 @@ replace (
github.com/spf13/cobra => github.com/spf13/cobra v1.1.1
github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
github.com/stretchr/testify => github.com/stretchr/testify v1.7.0
go.uber.org/zap => go.uber.org/zap v1.14.1 // indirect
go.uber.org/zap => go.uber.org/zap v1.17.0 // indirect
golang.org/x/lint => golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20210112200429-01de73cf58bd
golang.org/x/sync => golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
google.golang.org/api => google.golang.org/api v0.30.0
google.golang.org/api => google.golang.org/api v0.46.0
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20210111234610-22ae2b108f89 // indirect
google.golang.org/grpc => google.golang.org/grpc v1.27.1 // indirect
google.golang.org/grpc => google.golang.org/grpc v1.34.0 // indirect
gopkg.in/check.v1 => gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't this have to pick up a compatible version of k8s.io/legacy-cloud-providers that works properly with google.golang.org/api v0.46.0?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jpbetz

gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.3
gopkg.in/warnings.v0 => gopkg.in/warnings.v0 v0.1.2

k8s.io/api => k8s.io/api v0.21.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
k8s.io/apiserver => k8s.io/apiserver v0.21.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
k8s.io/client-go => k8s.io/client-go v0.21.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
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/cloud-provider-gcp/providers => ./providers
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
k8s.io/code-generator => k8s.io/code-generator v0.21.0
k8s.io/component-base => k8s.io/component-base v0.21.0
k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
k8s.io/cri-api => k8s.io/cri-api v0.21.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.0
k8s.io/code-generator => k8s.io/code-generator 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/klog/v2 => k8s.io/klog/v2 v2.8.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
k8s.io/kubectl => k8s.io/kubectl v0.21.0
k8s.io/kubelet => k8s.io/kubelet v0.21.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
k8s.io/metrics => k8s.io/metrics v0.21.0
k8s.io/mount-utils => k8s.io/mount-utils v0.21.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
k8s.io/utils => k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
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/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/pod-security-admission => k8s.io/pod-security-admission v0.22.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.0
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.22.0
k8s.io/sample-controller => k8s.io/sample-controller v0.22.0
k8s.io/utils => k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
)