Skip to content

Commit 35ac6e1

Browse files
estrozfabianvf
authored andcommitted
bump k8s dependencies to 1.12.3 (operator-framework#807)
* Gopkg.toml: kubernetes 1.12.3 * pkg/helm/release/manager*.go: fix broken API's from k8s upgrade * bump scaffolded k8s dependencies to v1.12.3 * fix controller-runtime to v0.1.8 * bump helm to v2.12.0 * revendor
1 parent 675d9ee commit 35ac6e1

File tree

6 files changed

+110
-88
lines changed

6 files changed

+110
-88
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,54 @@
1-
[[constraint]]
2-
name = "github.com/sirupsen/logrus"
3-
version = "1.0.4"
4-
5-
[[constraint]]
6-
name = "github.com/spf13/cobra"
7-
version = "0.0.3"
1+
[[override]]
2+
name = "k8s.io/kubernetes"
3+
version = "=1.12.3"
84

95
[[override]]
106
name = "k8s.io/api"
11-
version = "kubernetes-1.11.2"
7+
version = "kubernetes-1.12.3"
128

139
[[override]]
1410
name = "k8s.io/apimachinery"
15-
version = "kubernetes-1.11.2"
11+
version = "kubernetes-1.12.3"
1612

1713
[[override]]
1814
name = "k8s.io/apiextensions-apiserver"
19-
version = "kubernetes-1.11.2"
15+
version = "kubernetes-1.12.3"
2016

2117
[[override]]
2218
name = "k8s.io/apiserver"
23-
version = "kubernetes-1.11.2"
19+
version = "kubernetes-1.12.3"
2420

2521
[[override]]
2622
name = "k8s.io/client-go"
27-
version = "kubernetes-1.11.2"
23+
version = "kubernetes-1.12.3"
24+
25+
[[override]]
26+
name = "k8s.io/cli-runtime"
27+
version = "kubernetes-1.12.3"
28+
29+
[[constraint]]
30+
name = "sigs.k8s.io/controller-runtime"
31+
version = "=v0.1.8"
2832

2933
[[constraint]]
3034
name = "github.com/sergi/go-diff"
3135
version = "1.0.0"
3236

3337
[[constraint]]
34-
name = "sigs.k8s.io/controller-runtime"
35-
version = "v0.1.4"
38+
name = "k8s.io/helm"
39+
version = "=v2.12.0"
3640

3741
[[constraint]]
38-
name = "k8s.io/helm"
39-
version = "2.11.0"
42+
name = "github.com/sirupsen/logrus"
43+
version = "1.0.4"
4044

41-
[[override]]
42-
name = "k8s.io/kubernetes"
43-
version = "=1.11.2"
45+
[[constraint]]
46+
name = "github.com/spf13/cobra"
47+
version = "0.0.3"
4448

4549
# We need overrides for the following imports because dep can't resolve them
4650
# correctly. The easiest way to get this right is to use the versions that
47-
# k8s.io/helm uses. See https://github.com/helm/helm/blob/v2.11.0/glide.lock
51+
# k8s.io/helm uses. See https://github.com/helm/helm/blob/v2.12.0-rc.1/glide.lock
4852
[[override]]
4953
name = "github.com/russross/blackfriday"
5054
revision = "300106c228d52c8941d4b3de6054a6062a86dda3"
@@ -55,5 +59,4 @@
5559

5660
[[override]]
5761
name = "github.com/docker/docker"
58-
revision = "4f3616fb1c112e206b88cb7a9922bf49067a7756"
59-
62+
revision = "a9fbbdc8dd8794b20af358382ab780559bca589d"

0 commit comments

Comments
 (0)