Skip to content

Commit b34ae44

Browse files
authored
*: bump k8s deps to v1.18.2 (#2918)
1 parent 50d4071 commit b34ae44

File tree

23 files changed

+311
-396
lines changed

23 files changed

+311
-396
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ endif
1111

1212
VERSION = $(shell git describe --dirty --tags --always)
1313
GIT_COMMIT = $(shell git rev-parse HEAD)
14-
K8S_VERSION = v1.17.2
14+
K8S_VERSION = v1.18.2
1515
REPO = github.com/operator-framework/operator-sdk
1616
BUILD_PATH = $(REPO)/cmd/operator-sdk
1717
PKGS = $(shell go list ./... | grep -v /vendor/)

changelog/fragments/k8s-1-18.yaml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# entries is a list of entries to include in
2+
# release notes and/or the migration guide
3+
entries:
4+
- description: Updated Kubernetes dependencies to v1.18.2
5+
kind: "change"
6+
breaking: true
7+
migration:
8+
header: Kubernetes client-go contexts
9+
body: |-
10+
Operators using client-go directly and operators
11+
that have generated clientsets will be required to
12+
update many of their client-go function calls, which
13+
have signature changes related to passing contexts
14+
and options.
15+
16+
Users can use http://sigs.k8s.io/clientgofix to
17+
rewrite method invocations to the new signatures.
18+
19+
- description: Updated controller-runtime to v0.6.0
20+
kind: "change"
21+
breaking: true
22+
migration:
23+
header: Controller-runtime changes
24+
body: |-
25+
There were various breaking changes in controller-runtime
26+
v0.6.0.
27+
28+
- Informers methods now require a context parameter
29+
- Owns, For, and Watches funtions now take variadic
30+
functional option arguments.
31+
32+
- description: Updated controller-tools to v0.3.0
33+
kind: "change"
34+
35+
- description: Updated helm to v3.2.0
36+
kind: "change"
37+
38+
- description: Removed automatic migration of helm releases from v2 to v3
39+
kind: "removal"
40+
breaking: true
41+
migration:
42+
header: Helm operator no longer migrates v2 releases to v3
43+
body: |-
44+
The deprecated support for Helm v2 releases has been removed. If
45+
you require automigration of Helm v2 releases, continue using
46+
v0.17.x.
47+
48+
This removal does NOT affect support for v2 Helm charts, which
49+
are still supported by Helm v3.
50+
51+
- description: Removed support for deprecated helm release naming scheme
52+
kind: "removal"
53+
breaking: true
54+
migration:
55+
header: >
56+
Helm operator no longer supports deprecated UID-based release names
57+
body: |-
58+
In v0.11.0, the Helm operator began using the CR name as the release
59+
name while also maintaining backwards compatibility for legacy
60+
UID-based release names. Continued support for the UID-based release
61+
names has been removed.
62+
63+
Before upgrading to this release, delete and recreate custom resources
64+
that are still using the deprecated UID-based release name. To determine
65+
if you have any UID-based release names still in use, inspect the
66+
`status.deployedRelease` field of your custom resources and look for
67+
release names that end with a 25-character random string.

go.mod

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@ module github.com/operator-framework/operator-sdk
33
go 1.13
44

55
require (
6-
github.com/DATA-DOG/go-sqlmock v1.4.1 // indirect
76
github.com/blang/semver v3.5.1+incompatible
8-
github.com/coreos/prometheus-operator v0.38.0
7+
github.com/coreos/prometheus-operator v0.38.1-0.20200424145508-7e176fda06cc
98
github.com/fatih/structtag v1.1.0
109
github.com/go-logr/logr v0.1.0
1110
github.com/go-logr/zapr v0.1.1
12-
github.com/gobuffalo/packr v1.30.1 // indirect
1311
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
14-
github.com/helm/helm-2to3 v0.5.1
1512
github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365
16-
github.com/jmoiron/sqlx v1.2.0 // indirect
1713
github.com/markbates/inflect v1.0.4
18-
github.com/martinlindhe/base36 v1.0.0
1914
github.com/mattn/go-isatty v0.0.12
2015
github.com/mitchellh/go-homedir v1.1.0
2116
github.com/mitchellh/mapstructure v1.1.2
@@ -25,43 +20,40 @@ require (
2520
github.com/pkg/errors v0.9.1
2621
github.com/prometheus/client_golang v1.5.1
2722
github.com/rogpeppe/go-internal v1.5.0
28-
github.com/rubenv/sql-migrate v0.0.0-20191025130928-9355dd04f4b3 // indirect
2923
github.com/sergi/go-diff v1.0.0
3024
github.com/sirupsen/logrus v1.5.0
3125
github.com/spf13/afero v1.2.2
32-
github.com/spf13/cobra v0.0.5
26+
github.com/spf13/cobra v1.0.0
3327
github.com/spf13/pflag v1.0.5
3428
github.com/spf13/viper v1.4.0
35-
github.com/stretchr/testify v1.4.0
36-
github.com/ziutek/mymysql v1.5.4 // indirect
29+
github.com/stretchr/testify v1.5.1
3730
go.uber.org/zap v1.14.1
31+
golang.org/x/net v0.0.0-20200301022130-244492dfa37a
3832
golang.org/x/tools v0.0.0-20200327195553-82bb89366a1e
3933
gomodules.xyz/jsonpatch/v3 v3.0.1
40-
gopkg.in/gorp.v1 v1.7.2 // indirect
4134
gopkg.in/yaml.v2 v2.2.8
4235
gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966
43-
helm.sh/helm/v3 v3.1.2
44-
k8s.io/api v0.17.4
45-
k8s.io/apiextensions-apiserver v0.17.4
46-
k8s.io/apimachinery v0.17.4
47-
k8s.io/cli-runtime v0.17.4
36+
helm.sh/helm/v3 v3.2.0
37+
k8s.io/api v0.18.2
38+
k8s.io/apiextensions-apiserver v0.18.2
39+
k8s.io/apimachinery v0.18.2
40+
k8s.io/cli-runtime v0.18.2
4841
k8s.io/client-go v12.0.0+incompatible
49-
k8s.io/code-generator v0.17.4
50-
k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
51-
k8s.io/helm v2.16.3+incompatible
42+
k8s.io/code-generator v0.18.2
43+
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120
5244
k8s.io/klog v1.0.0
5345
k8s.io/kube-state-metrics v1.7.2
54-
k8s.io/kubectl v0.17.4
46+
k8s.io/kubectl v0.18.2
5547
rsc.io/letsencrypt v0.0.3 // indirect
56-
sigs.k8s.io/controller-runtime v0.5.2
57-
sigs.k8s.io/controller-tools v0.2.8
48+
sigs.k8s.io/controller-runtime v0.6.0
49+
sigs.k8s.io/controller-tools v0.3.0
5850
// Using branch feature/plugins-part-2-electric-boogaloo 27812b07d2db958a31f985b4d9800c204f68bff0
5951
sigs.k8s.io/kubebuilder v1.0.9-0.20200409105744-27812b07d2db
60-
// todo: Note: this needs to be bumped to v1.2.0 when we bump to k8s 1.18.
61-
sigs.k8s.io/yaml v1.1.0
52+
sigs.k8s.io/yaml v1.2.0
6253
)
6354

6455
replace (
6556
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
66-
k8s.io/client-go => k8s.io/client-go v0.17.4 // Required by prometheus-operator
57+
github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
58+
k8s.io/client-go => k8s.io/client-go v0.18.2
6759
)

0 commit comments

Comments
 (0)