Skip to content

Commit d351dd8

Browse files
author
Eric Stroczynski
authored
internal/pkg/scaffold: update go.mod scaffolds (#1790)
* internal/pkg/scaffold: pin github.com/prometheus/prometheus to v2.9.2 commit * internal/pkg/scaffold: rewrite mod files after go build * internal/pkg/scaffold: remove dependency manager file scaffold tests
1 parent fe8c81a commit d351dd8

File tree

5 files changed

+24
-364
lines changed

5 files changed

+24
-364
lines changed

internal/pkg/scaffold/ansible/go_mod.go

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -39,60 +39,16 @@ func (s *GoMod) GetInput() (input.Input, error) {
3939
const goModTmpl = `module {{ .Repo }}
4040
4141
require (
42-
cloud.google.com/go v0.37.2 // indirect
43-
contrib.go.opencensus.io/exporter/ocagent v0.4.9 // indirect
44-
github.com/Azure/go-autorest v11.7.0+incompatible // indirect
45-
github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 // indirect
46-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
47-
github.com/emicklei/go-restful v2.9.3+incompatible // indirect
48-
github.com/go-logr/logr v0.1.0 // indirect
49-
github.com/go-logr/zapr v0.1.1 // indirect
50-
github.com/go-openapi/spec v0.19.0 // indirect
51-
github.com/gogo/protobuf v1.2.1 // indirect
52-
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
53-
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
54-
github.com/google/uuid v1.1.1 // indirect
55-
github.com/googleapis/gnostic v0.2.0 // indirect
56-
github.com/gophercloud/gophercloud v0.0.0-20190328150603-33e54f40ffcf // indirect
42+
github.com/NYTimes/gziphandler v1.0.1 // indirect
5743
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
58-
github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
59-
github.com/hashicorp/golang-lru v0.5.1 // indirect
60-
github.com/imdario/mergo v0.3.7 // indirect
61-
github.com/json-iterator/go v1.1.6 // indirect
62-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
63-
github.com/markbates/inflect v1.0.4 // indirect
64-
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
65-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6644
github.com/operator-framework/operator-sdk master
67-
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
68-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
69-
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
70-
github.com/prometheus/procfs v0.0.0-20190328153300-af7bedc223fb // indirect
71-
github.com/sirupsen/logrus v1.4.0 // indirect
72-
github.com/spf13/afero v1.2.2 // indirect
7345
github.com/spf13/pflag v1.0.3
74-
go.uber.org/atomic v1.3.2 // indirect
75-
go.uber.org/multierr v1.1.0 // indirect
76-
go.uber.org/zap v1.9.1 // indirect
77-
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c // indirect
78-
golang.org/x/net v0.0.0-20190327214358-63eda1eb0650 // indirect
79-
golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914 // indirect
80-
golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc // indirect
81-
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
82-
google.golang.org/appengine v1.5.0 // indirect
83-
google.golang.org/genproto v0.0.0-20190327125643-d831d65fe17d // indirect
84-
k8s.io/api v0.0.0-20181213150558-05914d821849 // indirect
8546
k8s.io/apiextensions-apiserver v0.0.0-20190328030136-8ada4fd07db4
86-
k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93 // indirect
87-
k8s.io/client-go v0.0.0-20181213151034-8d9ed539ba31
88-
k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect
89-
k8s.io/klog v0.2.0 // indirect
47+
k8s.io/client-go v11.0.0+incompatible
9048
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
9149
k8s.io/kubernetes v1.14.1 // indirect
9250
sigs.k8s.io/controller-runtime v0.1.12
9351
sigs.k8s.io/controller-tools v0.1.10
94-
sigs.k8s.io/testing_frameworks v0.1.1 // indirect
95-
sigs.k8s.io/yaml v1.1.0 // indirect
9652
)
9753
9854
// Pinned to kubernetes-1.13.4
@@ -103,7 +59,12 @@ replace (
10359
k8s.io/kubernetes => k8s.io/kubernetes v1.13.4
10460
)
10561
106-
replace github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
62+
replace (
63+
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
64+
// Pinned to v2.9.2 (kubernetes-1.13.1) so https://proxy.golang.org can
65+
// resolve it correctly.
66+
github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
67+
)
10768
`
10869

10970
func PrintGoMod(asFile bool) error {

internal/pkg/scaffold/go_mod.go

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,40 +38,15 @@ func (s *GoMod) GetInput() (input.Input, error) {
3838
const goModTmpl = `module {{ .Repo }}
3939
4040
require (
41-
contrib.go.opencensus.io/exporter/ocagent v0.4.9 // indirect
42-
github.com/Azure/go-autorest v11.5.2+incompatible // indirect
43-
github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 // indirect
44-
github.com/coreos/prometheus-operator v0.26.0 // indirect
45-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
46-
github.com/emicklei/go-restful v2.8.1+incompatible // indirect
47-
github.com/go-logr/logr v0.1.0 // indirect
48-
github.com/go-logr/zapr v0.1.0 // indirect
49-
github.com/go-openapi/spec v0.18.0 // indirect
50-
github.com/golang/groupcache v0.0.0-20180924190550-6f2cf27854a4 // indirect
51-
github.com/golang/mock v1.2.0 // indirect
52-
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
53-
github.com/google/uuid v1.0.0 // indirect
54-
github.com/googleapis/gnostic v0.2.0 // indirect
55-
github.com/gophercloud/gophercloud v0.0.0-20190318015731-ff9851476e98 // indirect
56-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
57-
github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
58-
github.com/imdario/mergo v0.3.6 // indirect
41+
github.com/NYTimes/gziphandler v1.0.1 // indirect
5942
github.com/operator-framework/operator-sdk master
60-
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
61-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
6243
github.com/spf13/pflag v1.0.3
63-
go.opencensus.io v0.19.2 // indirect
64-
go.uber.org/atomic v1.3.2 // indirect
65-
go.uber.org/multierr v1.1.0 // indirect
66-
go.uber.org/zap v1.9.1 // indirect
67-
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
68-
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
69-
k8s.io/client-go v2.0.0-alpha.0.0.20181126152608-d082d5923d3c+incompatible
44+
k8s.io/api v0.0.0-20190612125737-db0771252981
45+
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
46+
k8s.io/client-go v11.0.0+incompatible
7047
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
71-
k8s.io/kube-state-metrics v1.6.0 // indirect
7248
sigs.k8s.io/controller-runtime v0.1.12
7349
sigs.k8s.io/controller-tools v0.1.10
74-
sigs.k8s.io/testing_frameworks v0.1.0 // indirect
7550
)
7651
7752
// Pinned to kubernetes-1.13.4
@@ -87,6 +62,9 @@ replace (
8762
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.1.12
8863
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
8964
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
65+
// Pinned to v2.9.2 (kubernetes-1.13.1) so https://proxy.golang.org can
66+
// resolve it correctly.
67+
github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
9068
)
9169
`
9270

internal/pkg/scaffold/go_mod_test.go

Lines changed: 0 additions & 92 deletions
This file was deleted.

internal/pkg/scaffold/gopkgtoml_test.go

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)