Skip to content

Commit 82fc42b

Browse files
1gtmtamalsaha
andauthored
[cherry-pick] Use github.com/prometheus/client_golang@v1.7.1 (#183) (#188)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent e64c0c7 commit 82fc42b

File tree

124 files changed

+6411
-1234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+6411
-1234
lines changed

go.mod

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,18 @@ require (
1616
k8s.io/apimachinery v0.18.3
1717
k8s.io/client-go v12.0.0+incompatible
1818
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
19-
kmodules.xyz/client-go v0.0.0-20200818171030-24b2ce405feb
19+
kmodules.xyz/client-go v0.0.0-20200905112811-2e29b973ee0c
2020
kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95
2121
kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9
2222
kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226
2323
sigs.k8s.io/yaml v1.2.0
24-
stash.appscode.dev/apimachinery v0.10.0
24+
stash.appscode.dev/apimachinery v0.10.1-0.20200914045248-546ceea96940
2525
)
2626

2727
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
2828

29+
replace cloud.google.com/go => cloud.google.com/go v0.49.0
30+
2931
replace git.apache.org/thrift.git => github.com/apache/thrift v0.13.0
3032

3133
replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v35.0.0+incompatible
@@ -52,12 +54,24 @@ replace github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logg
5254

5355
replace github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.5.0
5456

57+
replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
58+
59+
replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.2
60+
61+
replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.1
62+
5563
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
5664

57-
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.0.0
65+
replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.0.0-20200911141619-675d303ee0b8
66+
67+
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
5868

5969
replace go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
6070

71+
replace google.golang.org/api => google.golang.org/api v0.14.0
72+
73+
replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9
74+
6175
replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
6276

6377
replace k8s.io/api => github.com/kmodules/api v0.18.4-0.20200524125823-c8bc107809b9
@@ -66,6 +80,12 @@ replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.19.0-alpha.0.
6680

6781
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.18.4-0.20200521000930-14c5f6df9625
6882

83+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.3
84+
6985
replace k8s.io/client-go => k8s.io/client-go v0.18.3
7086

87+
replace k8s.io/component-base => k8s.io/component-base v0.18.3
88+
89+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 // release-1.18
90+
7191
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.19.0-alpha.0.0.20200521033432-49d3646051ad

go.sum

Lines changed: 20 additions & 60 deletions
Large diffs are not rendered by default.

vendor/github.com/cespare/xxhash/v2/.travis.yml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/LICENSE.txt

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/README.md

Lines changed: 67 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/go.mod

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/go.sum

Whitespace-only changes.

0 commit comments

Comments
 (0)