Skip to content

(c-r v0.2.0) internal/pkg/scaffold: update go.mod scaffolds #1801

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

Merged
estroz merged 3 commits into from
Aug 8, 2019
Merged

(c-r v0.2.0) internal/pkg/scaffold: update go.mod scaffolds #1801

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
59b5e8d
internal/pkg/scaffold: update go.mod scaffolds and add github.com/pro…
Aug 8, 2019
e5d4727
remove kube-state-metrics from go.mod scaffolds
Aug 8, 2019
9c2f544
fix go.sum
Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3
golang.org/x/tools v0.0.0-20190320215829-36c10c0a621f/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c h1:KfpJVdWhuRqNk4XVXzjXf2KAV4TBEP77SYdFGjeGuIE=
golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo=
gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4=
gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
Expand Down
16 changes: 7 additions & 9 deletions internal/pkg/scaffold/ansible/go_mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ const goModTmpl = `module {{ .Repo }}

require (
github.com/NYTimes/gziphandler v1.0.1 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
github.com/operator-framework/operator-sdk master
github.com/spf13/pflag v1.0.3
k8s.io/apiextensions-apiserver v0.0.0-20190328030136-8ada4fd07db4
k8s.io/client-go v11.0.0+incompatible
k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
k8s.io/kubernetes v1.14.1 // indirect
sigs.k8s.io/controller-runtime v0.2.0-beta.3
sigs.k8s.io/controller-tools v0.1.10
)
Expand All @@ -56,15 +56,13 @@ replace (
k8s.io/api => k8s.io/api kubernetes-1.14.1
k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.14.1
k8s.io/client-go => k8s.io/client-go kubernetes-1.14.1
k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.14.1
k8s.io/kubernetes => k8s.io/kubernetes v1.14.1
)

replace (
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.29.0
// Pinned to v2.9.2 (kubernetes-1.13.1) so https://proxy.golang.org can
// resolve it correctly.
github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
)
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
// resolve it correctly.
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
`

func PrintGoMod(asFile bool) error {
Expand Down
26 changes: 4 additions & 22 deletions internal/pkg/scaffold/go_mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,13 @@ func (s *GoMod) GetInput() (input.Input, error) {
const goModTmpl = `module {{ .Repo }}

require (
contrib.go.opencensus.io/exporter/ocagent v0.4.9 // indirect
github.com/Azure/go-autorest v11.5.2+incompatible // indirect
github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 // indirect
github.com/coreos/prometheus-operator v0.31.1 // indirect
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/emicklei/go-restful v2.8.1+incompatible // indirect
github.com/go-logr/logr v0.1.0 // indirect
github.com/go-logr/zapr v0.1.0 // indirect
github.com/go-openapi/spec v0.18.0 // indirect
github.com/golang/groupcache v0.0.0-20180924190550-6f2cf27854a4 // indirect
github.com/golang/mock v1.2.0 // indirect
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
github.com/google/uuid v1.0.0 // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gophercloud/gophercloud v0.0.0-20190318015731-ff9851476e98 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/operator-framework/operator-sdk master
github.com/spf13/pflag v1.0.3
k8s.io/api v0.0.0-20190612125737-db0771252981
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
k8s.io/client-go v11.0.0+incompatible
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
k8s.io/kube-state-metrics v1.6.0 // indirect
sigs.k8s.io/controller-runtime v0.2.0-beta.3
sigs.k8s.io/controller-tools v0.1.10
)
Expand All @@ -73,16 +55,16 @@ replace (
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.14.1
k8s.io/apimachinery => k8s.io/apimachinery kubernetes-1.14.1
k8s.io/client-go => k8s.io/client-go kubernetes-1.14.1
k8s.io/cloud-provider => k8s.io/cloud-provider kubernetes-1.14.1
)

replace (
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.2.0-beta.3
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
// Pinned to v2.9.2 (kubernetes-1.13.1) so https://proxy.golang.org can
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
// resolve it correctly.
github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
)
`

Expand Down
92 changes: 0 additions & 92 deletions internal/pkg/scaffold/go_mod_test.go
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions internal/pkg/scaffold/gopkgtoml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ required = [
name = "github.com/coreos/prometheus-operator"
version = "=v0.31.1"

[[override]]
name = "k8s.io/kube-state-metrics"
version = "v1.6.0"

[[override]]
name = "sigs.k8s.io/controller-runtime"
version = "=v0.2.0-beta.3"
Expand All @@ -94,11 +90,6 @@ required = [
[prune]
go-tests = true
non-go = true

[[prune.project]]
name = "k8s.io/kube-state-metrics"
unused-packages = true

`

func PrintDepGopkgTOML(asFile bool) error {
Expand Down
100 changes: 0 additions & 100 deletions internal/pkg/scaffold/gopkgtoml_test.go
View file
Open in desktop

This file was deleted.

Loading