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 go.mod for k8s 1.17 #8873

Merged
merged 3 commits into from
Apr 8, 2020
Merged

Update go.mod for k8s 1.17 #8873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c9c163
Update go.mod for k8s 1.17
justinsb Apr 8, 2020
b77693c
Update vendor
justinsb Apr 8, 2020
dfb75b8
Skip GCE cloudprovider flag cloud-provider-gce-l7lb-src-cidrs
justinsb Apr 8, 2020
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
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion cmd/kops/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ func NewCmdRoot(f *util.Factory, out io.Writer) *cobra.Command {
goflag.CommandLine.VisitAll(func(goflag *goflag.Flag) {
switch goflag.Name {
case "cloud-provider-gce-lb-src-cidrs":
// Skip; this is dragged in by the google cloudprovider dependency
case "cloud-provider-gce-l7lb-src-cidrs":
// Skip; these is dragged in by the google cloudprovider dependency

default:
cmd.PersistentFlags().AddGoFlag(goflag)
Expand Down
84 changes: 29 additions & 55 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,75 +2,49 @@ module k8s.io/kops

go 1.13

// Version kubernetes-1.16.3
//replace k8s.io/api => k8s.io/api kubernetes-1.16.3
//replace k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.16.3
//replace k8s.io/client-go => k8s.io/client-go kubernetes-1.16.3
//replace k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.16.3
//replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers kubernetes-1.16.3
//replace k8s.io/kubectl => k8s.io/kubectl kubernetes-1.16.3
// Version kubernetes-1.17.4 => tag v0.17.4

replace k8s.io/api => k8s.io/api v0.0.0-20191114100352-16d7abae0d2a
replace k8s.io/api => k8s.io/api v0.17.4

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191028221656-72ed19daf4bb
replace k8s.io/apimachinery => k8s.io/apimachinery v0.17.4

replace k8s.io/client-go => k8s.io/client-go v0.0.0-20191114101535-6c5935290e33
replace k8s.io/client-go => k8s.io/client-go v0.17.4

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191114112024-4bbba8331835
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.4

replace k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191114113550-6123e1c827f7
replace k8s.io/kubectl => k8s.io/kubectl v0.17.4

// We need a newer component-base
// replace k8s.io/component-base => k8s.io/component-base kubernetes-1.17.0-rc.2
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20191204084121-18d14e17701e
replace k8s.io/apiserver => k8s.io/apiserver v0.17.4

// Dependencies we don't really need, except that kubernetes specifies them as v0.0.0 which confuses go.mod
//replace k8s.io/apiserver => k8s.io/apiserver kubernetes-1.16.3
//replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.16.3
//replace k8s.io/kube-scheduler => k8s.io/kube-scheduler kubernetes-1.16.3
//replace k8s.io/kube-proxy => k8s.io/kube-proxy kubernetes-1.16.3
//replace k8s.io/cri-api => k8s.io/cri-api kubernetes-1.16.3
//replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib kubernetes-1.16.3
//replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers kubernetes-1.16.3
//replace k8s.io/component-base => k8s.io/component-base kubernetes-1.16.3
//replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap kubernetes-1.16.3
//replace k8s.io/metrics => k8s.io/metrics kubernetes-1.16.3
//replace k8s.io/sample-apiserver => k8s.io/sample-apiserver kubernetes-1.16.3
//replace k8s.io/kube-aggregator => k8s.io/kube-aggregator kubernetes-1.16.3
//replace k8s.io/kubelet => k8s.io/kubelet kubernetes-1.16.3
//replace k8s.io/cli-runtime => k8s.io/cli-runtime kubernetes-1.16.3
//replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager kubernetes-1.16.3
//replace k8s.io/code-generator => k8s.io/code-generator kubernetes-1.16.3
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.4

replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191114103151-9ca1dc586682
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.4

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191114105449-027877536833
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.4

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191114111229-2e90afcb56c7
replace k8s.io/cri-api => k8s.io/cri-api v0.17.4

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191114110717-50a77e50d7d9
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.4

replace k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.4

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191114112310-0da609c4ca2d
replace k8s.io/component-base => k8s.io/component-base v0.17.4

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191114112655-db9be3e678bb
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.4

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191114111741-81bb9acf592d
replace k8s.io/metrics => k8s.io/metrics v0.17.4

replace k8s.io/metrics => k8s.io/metrics v0.0.0-20191114105837-a4a2842dc51b
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.4

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191114104439-68caf20693ac
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.4

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191114103820-f023614fb9ea
replace k8s.io/kubelet => k8s.io/kubelet v0.17.4

replace k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191114110954-d67a8e7e2200
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.4

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191114110141-0a35778df828
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.4

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191114111510-6d1ed697a64b

replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
replace k8s.io/code-generator => k8s.io/code-generator v0.17.4

require (
cloud.google.com/go v0.38.0
Expand Down Expand Up @@ -123,22 +97,22 @@ require (
github.com/weaveworks/mesh v0.0.0-20170419100114-1f158d31de55
github.com/zclconf/go-cty v1.3.1
go.uber.org/zap v1.10.0
golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9
golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371
google.golang.org/api v0.17.0
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.2.7
gopkg.in/yaml.v2 v2.2.8
honnef.co/go/tools v0.0.1-2019.2.3
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/api v0.17.4
k8s.io/apimachinery v0.17.4
k8s.io/cli-runtime v0.17.4
k8s.io/client-go v0.17.4
k8s.io/cloud-provider-openstack v1.17.0
k8s.io/component-base v0.0.0
k8s.io/component-base v0.17.4
k8s.io/helm v2.9.0+incompatible
k8s.io/klog v1.0.0
k8s.io/kubectl v0.0.0
Expand Down
Loading