Skip to content

Commit c14c36d

Browse files
authored
[cherry-pick] Update Kubernetes v1.18.9 dependencies (#282) (#290)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent f088a35 commit c14c36d

File tree

104 files changed

+1283
-2857
lines changed

Some content is hidden

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

104 files changed

+1283
-2857
lines changed

go.mod

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,32 @@ module stash.appscode.dev/elasticsearch
33
go 1.12
44

55
require (
6-
github.com/appscode/go v0.0.0-20200323182826-54e98e09185a
6+
github.com/appscode/go v0.0.0-20200928211031-cc0c23082d91
77
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27
8-
github.com/go-openapi/spec v0.19.7
8+
github.com/go-openapi/spec v0.19.8
99
github.com/gogo/protobuf v1.3.1
1010
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
1111
github.com/google/gofuzz v1.1.0
1212
github.com/spf13/cobra v0.0.5
1313
github.com/yudai/gojsondiff v1.0.0
1414
go.bytebuilders.dev/license-verifier/kubernetes v0.3.0
15-
k8s.io/apiextensions-apiserver v0.18.3
16-
k8s.io/apimachinery v0.18.3
15+
k8s.io/apiextensions-apiserver v0.18.9
16+
k8s.io/apimachinery v0.18.9
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-20200915091229-7df16c29f4e8
20-
kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95
21-
kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9
22-
kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226
19+
k8s.io/kubernetes v1.18.9 // indirect
20+
kmodules.xyz/client-go v0.0.0-20200929030759-cce6a3c623c1
21+
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
22+
kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb
23+
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 // indirect
24+
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab
25+
kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e // indirect
2326
sigs.k8s.io/yaml v1.2.0
2427
stash.appscode.dev/apimachinery v0.11.0
2528
)
2629

30+
// release-1.18
31+
2732
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
2833

2934
replace cloud.google.com/go => cloud.google.com/go v0.49.0
@@ -62,7 +67,9 @@ replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.3.1
6267

6368
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
6469

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
70+
replace github.com/prometheus-operator/prometheus-operator => github.com/prometheus-operator/prometheus-operator v0.42.0
71+
72+
replace github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring => github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.42.0
6673

6774
replace github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
6875

@@ -74,18 +81,20 @@ replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20191115
7481

7582
replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
7683

77-
replace k8s.io/api => github.com/kmodules/api v0.18.4-0.20200524125823-c8bc107809b9
84+
replace k8s.io/api => github.com/kmodules/api v0.18.10-0.20200922195318-d60fe725dea0
85+
86+
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.19.0-alpha.0.0.20200922195535-0c9a1b86beec
7887

79-
replace k8s.io/apimachinery => github.com/kmodules/apimachinery v0.19.0-alpha.0.0.20200520235721-10b58e57a423
88+
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.18.10-0.20200922195747-1bd1cc8f00d1
8089

81-
replace k8s.io/apiserver => github.com/kmodules/apiserver v0.18.4-0.20200521000930-14c5f6df9625
90+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.9
8291

83-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.3
92+
replace k8s.io/client-go => github.com/kmodules/k8s-client-go v0.18.10-0.20200922201634-73fedf3d677e
8493

85-
replace k8s.io/client-go => k8s.io/client-go v0.18.3
94+
replace k8s.io/component-base => k8s.io/component-base v0.18.9
8695

87-
replace k8s.io/component-base => k8s.io/component-base v0.18.3
96+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
8897

89-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 // release-1.18
98+
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.19.0-alpha.0.0.20200922200158-8b13196d8dc4
9099

91-
replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.19.0-alpha.0.0.20200521033432-49d3646051ad
100+
replace k8s.io/utils => k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89

go.sum

Lines changed: 52 additions & 28 deletions
Large diffs are not rendered by default.

vendor/github.com/evanphx/json-patch/.travis.yml

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

vendor/github.com/evanphx/json-patch/LICENSE

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/evanphx/json-patch/README.md

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

vendor/github.com/evanphx/json-patch/merge.go

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

vendor/github.com/evanphx/json-patch/patch.go

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

0 commit comments

Comments
 (0)