Skip to content

Commit ffa4b55

Browse files
estrozestroz
committed
go.mod,go.sum,internal/pkg/scaffold: update go.mod and scaffolds
with git.apache.org mirror, revendor
1 parent c0a7fc3 commit ffa4b55

File tree

5 files changed

+31
-9
lines changed

5 files changed

+31
-9
lines changed

‎go.mod

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,13 @@ replace (
112112
k8s.io/kubernetes => k8s.io/kubernetes v1.14.1
113113
)
114114

115-
replace github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
115+
replace (
116+
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
117+
// down. The github mirror should be used instead.
118+
// Locking to a specific version (from 'go mod graph'):
119+
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
120+
github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
121+
)
116122

117123
// Remove when controller-tools v0.2.2 is released
118124
// Required for the bugfix https://github.com/kubernetes-sigs/controller-tools/pull/322

‎go.sum

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ cloud.google.com/go v0.37.2 h1:4y4L7BdHenTfZL0HervofNTHh9Ad6mNX72cQvl+5eH0=
77
cloud.google.com/go v0.37.2/go.mod h1:H8IAquKe2L30IxoupDgqTaQvKSwF/c8prYHynGIWQbA=
88
contrib.go.opencensus.io/exporter/ocagent v0.4.12 h1:jGFvw3l57ViIVEPKKEUXPcLYIXJmQxLUh6ey1eJhwyc=
99
contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
10-
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
11-
git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
1210
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
1311
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
1412
github.com/Azure/go-autorest v11.1.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
@@ -41,6 +39,7 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx
4139
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
4240
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
4341
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
42+
github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
4443
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
4544
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
4645
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,17 @@ replace (
5757
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver kubernetes-1.14.1
5858
)
5959
60-
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
61-
// resolve it correctly.
62-
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
60+
replace (
61+
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
62+
// down. The github mirror should be used instead.
63+
// [email protected]
64+
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
65+
// [email protected]
66+
git.apache.org/thrift.git v0.12.0 => github.com/apache/thrift v0.12.0
67+
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
68+
// resolve it correctly.
69+
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286
70+
)
6371
`
6472

6573
func PrintGoMod() error {

‎internal/pkg/scaffold/go_mod.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ func (s *GoMod) GetInput() (input.Input, error) {
3838
const goModTmpl = `module {{ .Repo }}
3939
4040
require (
41-
github.com/coreos/prometheus-operator v0.31.1 // indirect
4241
github.com/operator-framework/operator-sdk master
4342
github.com/spf13/pflag v1.0.3
4443
k8s.io/api v0.0.0-20190612125737-db0771252981
4544
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
4645
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
47-
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
4846
sigs.k8s.io/controller-runtime v0.2.0
4947
)
5048
@@ -58,6 +56,12 @@ replace (
5856
)
5957
6058
replace (
59+
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
60+
// down. The github mirror should be used instead.
61+
// [email protected]
62+
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
63+
// [email protected]
64+
git.apache.org/thrift.git v0.12.0 => github.com/apache/thrift v0.12.0
6165
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
6266
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
6367
// resolve it correctly.

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ require (
6161
gotest.tools v2.2.0+incompatible // indirect
6262
k8s.io/apiserver v0.0.0-20181213151703-3ccfe8365421 // indirect
6363
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
64-
k8s.io/helm v2.14.1+incompatible // indirect
6564
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
6665
sigs.k8s.io/controller-runtime v0.2.0
6766
)
@@ -79,6 +78,12 @@ replace (
7978
)
8079
8180
replace (
81+
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
82+
// down. The github mirror should be used instead.
83+
// [email protected]
84+
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
85+
// [email protected]
86+
git.apache.org/thrift.git v0.12.0 => github.com/apache/thrift v0.12.0
8287
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
8388
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
8489
// resolve it correctly.

0 commit comments

Comments
 (0)