Skip to content

Commit 3dcdc04

Browse files
author
Eric Stroczynski
authored
(c-r v0.2.0) internal/pkg/scaffold: update dep manager scaffolds (#1801)
* internal/pkg/scaffold: update go.mod scaffolds and add github.com/prometheus/prometheus replace * internal/pkg/scaffold: remove kube-state-metrics from dep manager file scaffolds
1 parent 7b855fe commit 3dcdc04

File tree

7 files changed

+22
-281
lines changed

7 files changed

+22
-281
lines changed

go.sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
542542
golang.org/x/tools v0.0.0-20190320215829-36c10c0a621f/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
543543
golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c h1:KfpJVdWhuRqNk4XVXzjXf2KAV4TBEP77SYdFGjeGuIE=
544544
golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
545-
gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo=
545+
gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4=
546546
gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
547547
google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
548548
google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=

internal/pkg/scaffold/ansible/go_mod.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ const goModTmpl = `module {{ .Repo }}
4040
4141
require (
4242
github.com/NYTimes/gziphandler v1.0.1 // indirect
43+
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
4344
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
4445
github.com/operator-framework/operator-sdk master
4546
github.com/spf13/pflag v1.0.3
46-
k8s.io/apiextensions-apiserver v0.0.0-20190328030136-8ada4fd07db4
47-
k8s.io/client-go v11.0.0+incompatible
47+
k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
48+
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
4849
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
49-
k8s.io/kubernetes v1.14.1 // indirect
5050
sigs.k8s.io/controller-runtime v0.2.0-beta.3
5151
sigs.k8s.io/controller-tools v0.1.10
5252
)
@@ -56,15 +56,13 @@ replace (
5656
k8s.io/api => k8s.io/api kubernetes-1.14.1
5757
k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.14.1
5858
k8s.io/client-go => k8s.io/client-go kubernetes-1.14.1
59+
k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.14.1
5960
k8s.io/kubernetes => k8s.io/kubernetes v1.14.1
6061
)
6162
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-
)
63+
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
64+
// resolve it correctly.
65+
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
6866
`
6967

7068
func PrintGoMod(asFile bool) error {

internal/pkg/scaffold/go_mod.go

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,13 @@ 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
4441
github.com/coreos/prometheus-operator v0.31.1 // 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
5942
github.com/operator-framework/operator-sdk master
6043
github.com/spf13/pflag v1.0.3
6144
k8s.io/api v0.0.0-20190612125737-db0771252981
6245
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
63-
k8s.io/client-go v11.0.0+incompatible
46+
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
6447
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
65-
k8s.io/kube-state-metrics v1.6.0 // indirect
6648
sigs.k8s.io/controller-runtime v0.2.0-beta.3
6749
sigs.k8s.io/controller-tools v0.1.10
6850
)
@@ -73,16 +55,16 @@ replace (
7355
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.14.1
7456
k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.14.1
7557
k8s.io/client-go => k8s.io/client-go kubernetes-1.14.1
58+
k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.14.1
7659
)
7760
7861
replace (
7962
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
8063
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.2.0-beta.3
8164
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
82-
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
83-
// Pinned to v2.9.2 (kubernetes-1.13.1) so https://proxy.golang.org can
65+
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
8466
// resolve it correctly.
85-
github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
67+
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
8668
)
8769
`
8870

internal/pkg/scaffold/go_mod_test.go

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

internal/pkg/scaffold/gopkgtoml.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ required = [
7272
name = "github.com/coreos/prometheus-operator"
7373
version = "=v0.31.1"
7474
75-
[[override]]
76-
name = "k8s.io/kube-state-metrics"
77-
version = "v1.6.0"
78-
7975
[[override]]
8076
name = "sigs.k8s.io/controller-runtime"
8177
version = "=v0.2.0-beta.3"
@@ -94,11 +90,6 @@ required = [
9490
[prune]
9591
go-tests = true
9692
non-go = true
97-
98-
[[prune.project]]
99-
name = "k8s.io/kube-state-metrics"
100-
unused-packages = true
101-
10293
`
10394

10495
func PrintDepGopkgTOML(asFile bool) error {

internal/pkg/scaffold/gopkgtoml_test.go

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

0 commit comments

Comments
 (0)