diff --git a/go.sum b/go.sum index 2a80f86d76..266d625812 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/internal/pkg/scaffold/ansible/go_mod.go b/internal/pkg/scaffold/ansible/go_mod.go index 71dc23892b..8b750fdee8 100644 --- a/internal/pkg/scaffold/ansible/go_mod.go +++ b/internal/pkg/scaffold/ansible/go_mod.go @@ -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 ) @@ -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 { diff --git a/internal/pkg/scaffold/go_mod.go b/internal/pkg/scaffold/go_mod.go index c1bd794949..3ff4f8a217 100644 --- a/internal/pkg/scaffold/go_mod.go +++ b/internal/pkg/scaffold/go_mod.go @@ -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 ) @@ -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 ) ` diff --git a/internal/pkg/scaffold/go_mod_test.go b/internal/pkg/scaffold/go_mod_test.go deleted file mode 100644 index 79ea2c07ad..0000000000 --- a/internal/pkg/scaffold/go_mod_test.go +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright 2019 The Operator-SDK Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package scaffold - -import ( - "testing" - - "github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input" - "github.com/operator-framework/operator-sdk/internal/util/diffutil" -) - -func TestGoMod(t *testing.T) { - s, buf := setupScaffoldAndWriter() - err := s.Execute(appConfig, &GoMod{ - Input: input.Input{Repo: "github.com/example-inc/app-operator"}, - }) - if err != nil { - t.Fatalf("Failed to execute the scaffold: (%v)", err) - } - - if goModExp != buf.String() { - diffs := diffutil.Diff(goModExp, buf.String()) - t.Fatalf("Expected vs actual differs.\n%v", diffs) - } -} - -const goModExp = `module github.com/example-inc/app-operator - -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/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect - github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/spf13/pflag v1.0.3 - go.opencensus.io v0.19.2 // indirect - go.uber.org/atomic v1.3.2 // indirect - go.uber.org/multierr v1.1.0 // indirect - go.uber.org/zap v1.9.1 // indirect - golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect - k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 - k8s.io/client-go v2.0.0-alpha.0.0.20181126152608-d082d5923d3c+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 - sigs.k8s.io/testing_frameworks v0.1.0 // indirect -) - -// Pinned to kubernetes-1.14.1 -replace ( - k8s.io/api => k8s.io/api kubernetes-1.14.1 - 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 -) - -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 -) -` diff --git a/internal/pkg/scaffold/gopkgtoml.go b/internal/pkg/scaffold/gopkgtoml.go index 43aee36020..06bb183a61 100644 --- a/internal/pkg/scaffold/gopkgtoml.go +++ b/internal/pkg/scaffold/gopkgtoml.go @@ -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" @@ -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 { diff --git a/internal/pkg/scaffold/gopkgtoml_test.go b/internal/pkg/scaffold/gopkgtoml_test.go deleted file mode 100644 index 43f469c7ea..0000000000 --- a/internal/pkg/scaffold/gopkgtoml_test.go +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2018 The Operator-SDK Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package scaffold - -import ( - "testing" - - "github.com/operator-framework/operator-sdk/internal/util/diffutil" -) - -func TestGopkgtoml(t *testing.T) { - s, buf := setupScaffoldAndWriter() - err := s.Execute(appConfig, &GopkgToml{}) - if err != nil { - t.Fatalf("Failed to execute the scaffold: (%v)", err) - } - - if gopkgtomlExp != buf.String() { - diffs := diffutil.Diff(gopkgtomlExp, buf.String()) - t.Fatalf("Expected vs actual differs.\n%v", diffs) - } -} - -const gopkgtomlExp = `# Force dep to vendor the code generators, which aren't imported just used at dev time. -required = [ - "sigs.k8s.io/controller-tools/pkg/crd/generator", -] - -[[override]] - name = "github.com/go-openapi/spec" - branch = "master" - -[[override]] - name = "sigs.k8s.io/controller-tools" - revision = "9d55346c2bde73fb3326ac22eac2e5210a730207" - -[[override]] - name = "k8s.io/api" - # revision for tag "kubernetes-1.14.1" - revision = "6e4e0e4f393bf5e8bbff570acd13217aa5a770cd" - -[[override]] - name = "k8s.io/apiextensions-apiserver" - # revision for tag "kubernetes-1.14.1" - revision = "727a075fdec8319bf095330e344b3ccc668abc73" - -[[override]] - name = "k8s.io/apimachinery" - # revision for tag "kubernetes-1.14.1" - revision = "6a84e37a896db9780c75367af8d2ed2bb944022e" - -[[override]] - name = "k8s.io/client-go" - # revision for tag "kubernetes-1.14.1" - revision = "1a26190bd76a9017e289958b9fba936430aa3704" - -[[override]] - 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" - -# Required when resolving controller-runtime dependencies. -[[override]] - name = "gopkg.in/fsnotify.v1" - source = "https://github.com/fsnotify/fsnotify.git" - -[[constraint]] - name = "github.com/operator-framework/operator-sdk" - # The version rule is used for a specific release and the master branch for in between releases. - branch = "master" #osdk_branch_annotation - # version = "=v0.9.0" #osdk_version_annotation - -[prune] - go-tests = true - non-go = true - - [[prune.project]] - name = "k8s.io/kube-state-metrics" - unused-packages = true - -` diff --git a/internal/pkg/scaffold/helm/go_mod.go b/internal/pkg/scaffold/helm/go_mod.go index b530611e07..b9b65c5281 100644 --- a/internal/pkg/scaffold/helm/go_mod.go +++ b/internal/pkg/scaffold/helm/go_mod.go @@ -39,68 +39,30 @@ func (s *GoMod) GetInput() (input.Input, error) { const goModTmpl = `module {{ .Repo }} require ( - github.com/NYTimes/gziphandler v1.0.1 // indirect - github.com/coreos/etcd v3.3.12+incompatible // indirect - github.com/coreos/go-semver v0.2.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect github.com/coreos/prometheus-operator v0.31.1 // indirect - github.com/cyphar/filepath-securejoin v0.2.2 // indirect - github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect - github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff // indirect github.com/docker/docker v0.0.0-20180612054059-a9fbbdc8dd87 // indirect - github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect - github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect github.com/emicklei/go-restful v2.9.3+incompatible // indirect - github.com/evanphx/json-patch v4.1.0+incompatible // indirect - github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect - github.com/fatih/camelcase v1.0.0 // indirect - github.com/go-logr/logr v0.1.0 // indirect - github.com/go-logr/zapr v0.1.1 // indirect - github.com/go-openapi/jsonpointer v0.18.0 // indirect - github.com/go-openapi/jsonreference v0.18.0 // indirect github.com/go-openapi/spec v0.19.0 // indirect - github.com/go-openapi/swag v0.19.0 // indirect - github.com/gobwas/glob v0.2.3 // indirect - github.com/gogo/protobuf v1.2.1 // indirect - github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect github.com/google/btree v1.0.0 // indirect - github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect - github.com/google/uuid v1.1.1 // indirect - github.com/googleapis/gnostic v0.2.0 // indirect - github.com/gophercloud/gophercloud v0.0.0-20190328150603-33e54f40ffcf // indirect github.com/gorilla/websocket v1.4.0 // indirect github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect + github.com/imdario/mergo v0.3.7 // indirect + github.com/jonboulle/clockwork v0.1.0 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/operator-framework/operator-sdk master github.com/spf13/pflag v1.0.3 github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 // indirect - github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect - github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect - go.etcd.io/bbolt v1.3.2 // indirect - go.uber.org/atomic v1.3.2 // indirect - go.uber.org/multierr v1.1.0 // indirect - go.uber.org/zap v1.9.1 // indirect - golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c // indirect - golang.org/x/net v0.0.0-20190327214358-63eda1eb0650 // indirect - golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914 // indirect - golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc // indirect golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect google.golang.org/appengine v1.5.0 // indirect - google.golang.org/genproto v0.0.0-20190327125643-d831d65fe17d // indirect - gopkg.in/square/go-jose.v2 v2.3.0 // indirect gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20181213150558-05914d821849 // indirect - k8s.io/apiextensions-apiserver v0.0.0-20181213153335-0fe22c71c476 - k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93 // indirect k8s.io/apiserver v0.0.0-20181213151703-3ccfe8365421 // indirect - k8s.io/cli-runtime v0.0.0-20181213153952-835b10687cb6 // indirect - k8s.io/client-go v0.0.0-20181213151034-8d9ed539ba31 - k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect - k8s.io/helm v2.14.1 // indirect - k8s.io/klog v0.2.0 // indirect + k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible + k8s.io/helm v2.14.1+incompatible // indirect k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect - k8s.io/kubernetes v1.14.1 // indirect - k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect sigs.k8s.io/controller-runtime v0.2.0-beta.3 sigs.k8s.io/controller-tools v0.1.10 ) @@ -118,10 +80,10 @@ replace ( ) 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 + github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1 + // 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 ) `