Skip to content

Commit 691e715

Browse files
joelanfordjoelanford
committed
*/go_mod.go: update go.mod templates
1 parent 82b046e commit 691e715

File tree

3 files changed

+123
-66
lines changed

3 files changed

+123
-66
lines changed

‎internal/pkg/scaffold/ansible/go_mod.go

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,58 @@ func (s *GoMod) GetInput() (input.Input, error) {
3939
const goModTmpl = `module {{ .Repo }}
4040
4141
require (
42-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
4342
github.com/operator-framework/operator-sdk master
44-
github.com/spf13/pflag v1.0.3
45-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
46-
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
47-
sigs.k8s.io/controller-runtime v0.2.0
43+
sigs.k8s.io/controller-runtime master
4844
)
4945
50-
// Pinned to kubernetes-1.14.1
46+
// Pinned to kubernetes-1.15.4
5147
replace (
52-
k8s.io/api => k8s.io/api kubernetes-1.14.1
53-
k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.14.1
54-
k8s.io/client-go => k8s.io/client-go kubernetes-1.14.1
55-
k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.14.1
56-
k8s.io/kubernetes => k8s.io/kubernetes v1.14.1
57-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.14.1
48+
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
49+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
50+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
51+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
52+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
53+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
54+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
55+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
56+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
57+
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
58+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
59+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
60+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
61+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
62+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
63+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
64+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
65+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
66+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
67+
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
68+
k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
69+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
70+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
71+
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
5872
)
5973
6074
replace (
6175
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
6276
// down. The github mirror should be used instead.
6377
// Locking to a specific version (from 'go mod graph'):
6478
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
65-
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
66-
// resolve it correctly.
67-
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
79+
80+
// github.com/Azure/go-autorest/autorest has different versions for the Go
81+
// modules than it does for releases on the repository. Note the correct
82+
// version when updating.
83+
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.2.0+incompatible
84+
github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.0
85+
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
86+
87+
// Required by OLM
88+
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
89+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
90+
91+
// Need this to get prometheus-operator dep to work
92+
github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20190424153033-d3245f150225
93+
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2
6894
)
6995
`
7096

‎internal/pkg/scaffold/go_mod.go

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,57 @@ const goModTmpl = `module {{ .Repo }}
3939
4040
require (
4141
github.com/operator-framework/operator-sdk master
42-
github.com/spf13/pflag v1.0.3
43-
k8s.io/api v0.0.0-20190612125737-db0771252981
44-
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
45-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
46-
sigs.k8s.io/controller-runtime v0.2.0
42+
sigs.k8s.io/controller-runtime master
4743
)
4844
49-
// Pinned to kubernetes-1.14.1
45+
// Pinned to kubernetes-1.16.1
5046
replace (
51-
k8s.io/api => k8s.io/api kubernetes-1.14.1
52-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.14.1
53-
k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.14.1
54-
k8s.io/client-go => k8s.io/client-go kubernetes-1.14.1
55-
k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.14.1
47+
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
48+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
49+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
50+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
51+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
52+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
53+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
54+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
55+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
56+
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
57+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
58+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
59+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
60+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
61+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
62+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
63+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
64+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
65+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
66+
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
67+
k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
68+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
69+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
70+
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
5671
)
5772
5873
replace (
5974
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
6075
// down. The github mirror should be used instead.
6176
// Locking to a specific version (from 'go mod graph'):
6277
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
63-
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
64-
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
65-
// resolve it correctly.
66-
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
78+
79+
// github.com/Azure/go-autorest/autorest has different versions for the Go
80+
// modules than it does for releases on the repository. Note the correct
81+
// version when updating.
82+
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.2.0+incompatible
83+
github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.0
84+
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
85+
86+
// Required by OLM
87+
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
88+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
89+
90+
// Need this to get prometheus-operator dep to work
91+
github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20190424153033-d3245f150225
92+
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2
6793
)
6894
`
6995

‎internal/pkg/scaffold/helm/go_mod.go

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,53 +39,58 @@ func (s *GoMod) GetInput() (input.Input, error) {
3939
const goModTmpl = `module {{ .Repo }}
4040
4141
require (
42-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
43-
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
44-
github.com/coreos/prometheus-operator v0.31.1 // indirect
45-
github.com/docker/docker v0.0.0-20180612054059-a9fbbdc8dd87 // indirect
46-
github.com/emicklei/go-restful v2.9.3+incompatible // indirect
47-
github.com/go-openapi/spec v0.19.0 // indirect
48-
github.com/google/btree v1.0.0 // indirect
49-
github.com/gorilla/websocket v1.4.0 // indirect
50-
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
51-
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
52-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
53-
github.com/imdario/mergo v0.3.7 // indirect
54-
github.com/jonboulle/clockwork v0.1.0 // indirect
55-
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
5642
github.com/operator-framework/operator-sdk master
57-
github.com/spf13/pflag v1.0.3
58-
github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 // indirect
59-
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
60-
google.golang.org/appengine v1.5.0 // indirect
61-
gotest.tools v2.2.0+incompatible // indirect
62-
k8s.io/apiserver v0.0.0-20181213151703-3ccfe8365421 // indirect
63-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
64-
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
65-
sigs.k8s.io/controller-runtime v0.2.0
43+
sigs.k8s.io/controller-runtime master
6644
)
6745
68-
// Pinned to kubernetes-1.14.1
46+
// Pinned to kubernetes-1.15.4
6947
replace (
70-
k8s.io/api => k8s.io/api kubernetes-1.14.1
71-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.14.1
72-
k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.14.1
73-
k8s.io/apiserver => k8s.io/apiserver kubernetes-1.14.1
74-
k8s.io/cli-runtime => k8s.io/cli-runtime kubernetes-1.14.1
75-
k8s.io/client-go => k8s.io/client-go kubernetes-1.14.1
76-
k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.14.1
77-
k8s.io/kubernetes => k8s.io/kubernetes v1.14.1
48+
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
49+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
50+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
51+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
52+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
53+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
54+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
55+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
56+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
57+
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
58+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
59+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
60+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
61+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
62+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
63+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
64+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
65+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
66+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
67+
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
68+
k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
69+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
70+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
71+
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
7872
)
7973
8074
replace (
8175
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
8276
// down. The github mirror should be used instead.
8377
// Locking to a specific version (from 'go mod graph'):
8478
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
85-
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
86-
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
87-
// resolve it correctly.
88-
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
79+
80+
// github.com/Azure/go-autorest/autorest has different versions for the Go
81+
// modules than it does for releases on the repository. Note the correct
82+
// version when updating.
83+
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.2.0+incompatible
84+
github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.0
85+
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
86+
87+
// Required by OLM
88+
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
89+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
90+
91+
// Need this to get prometheus-operator dep to work
92+
github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20190424153033-d3245f150225
93+
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2
8994
)
9095
`
9196

0 commit comments

Comments
 (0)