Skip to content

Commit 17d3890

Browse files
joelanfordjoelanford
authored
Bump to controller-runtime 0.3.0 and Kubernetes 1.15 (#2083)
* Bump kubernetes dependencies to 1.15.4 * bump controller-tools to v0.2.2 * CHANGELOG.md: add lines for #2083 * doc/dev/release.md: tweak release instructions for go.mod changes
1 parent c30168e commit 17d3890

File tree

8 files changed

+466
-364
lines changed

8 files changed

+466
-364
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
### Changed
99

1010
- **Breaking change:** Changed required Go version from `1.12` to `1.13`. This change applies to the SDK project itself and Go projects scaffolded by the SDK. Projects that import this version of the SDK require Go 1.13 to compile. ([#1949](https://github.com/operator-framework/operator-sdk/pull/1949))
11+
- Upgrade Kubernetes version from `kubernetes-1.14.1` to `kubernetes-1.15.4`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
12+
- Upgrade Helm version from `v2.14.1` to `v2.15.0`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
13+
- Upgrade [`controller-runtime`](https://github.com/kubernetes-sigs/controller-runtime) version from `v0.2.0` to `v0.3.0`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
14+
- Upgrade [`controller-tools`](https://github.com/kubernetes-sigs/controller-tools) version from `v0.2.1+git` to `v0.2.2`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
1115

1216
### Deprecated
1317

‎doc/dev/release.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,8 @@ $ git checkout -b release-v1.3.0
196196
Commit the following changes:
197197
198198
- `version/version.go`: update `Version` to `v1.3.0`.
199-
- `internal/scaffold/go_mod.go`, in the `replace` block for `github.com/operator-framework/operator-sdk`:
200-
- Add the following `replace` line to the bottom of `go.mod`: `replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v1.3.0`.
201-
- If a `replace` line already exists, change the version to `v1.3.0`.
199+
- `internal/scaffold/go_mod.go`, in the `require` block for `github.com/operator-framework/operator-sdk`:
200+
- Change the version for `github.com/operator-framework/operator-sdk` from `master` to `v1.3.0`.
202201
- `internal/scaffold/helm/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
203202
- `internal/scaffold/ansible/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
204203
- `CHANGELOG.md`: update the `## Unreleased` header to `## v1.3.0`.
@@ -237,8 +236,8 @@ Once this tag passes CI, go to step 3. For more info on tagging, see the [releas
237236
Check out a new branch from master (or use your `release-v1.3.0` branch) and commit the following changes:
238237
239238
- `version/version.go`: update `Version` to `v1.3.0+git`.
240-
- `internal/scaffold/go_mod.go`, in the `replace` block for `github.com/operator-framework/operator-sdk`:
241-
- Remove the `replace` line at the bottom of `go.mod`: `replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v1.3.0`.
239+
- `internal/scaffold/go_mod.go`, in the `require` block for `github.com/operator-framework/operator-sdk`:
240+
- Change the version for `github.com/operator-framework/operator-sdk` from `v1.3.0` to `master`.
242241
- `internal/scaffold/helm/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
243242
- `internal/scaffold/ansible/go_mod.go`: same as for `internal/scaffold/go_mod.go`.
244243
- `CHANGELOG.md`: add the following as a new set of headers above `## v1.3.0`:

‎go.mod

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

55
require (
6-
cloud.google.com/go v0.37.2 // indirect
7-
contrib.go.opencensus.io/exporter/ocagent v0.4.12 // indirect
8-
github.com/Azure/go-autorest v11.7.0+incompatible // indirect
96
github.com/DATA-DOG/go-sqlmock v1.3.3 // indirect
10-
github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e // indirect
117
github.com/Masterminds/goutils v1.1.0 // indirect
12-
github.com/Masterminds/semver v1.4.2 // indirect
13-
github.com/Masterminds/sprig v0.0.0-20190301161902-9f8fceff796f // indirect
14-
github.com/PuerkitoBio/purell v1.1.1 // indirect
8+
github.com/Masterminds/semver v1.5.0 // indirect
9+
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
1510
github.com/blang/semver v3.5.1+incompatible
16-
github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
17-
github.com/coreos/bbolt v1.3.3 // indirect
1811
github.com/coreos/go-semver v0.2.0
1912
github.com/coreos/prometheus-operator v0.29.0
20-
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
21-
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
22-
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
23-
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
24-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
25-
github.com/fatih/camelcase v1.0.0 // indirect
26-
github.com/ghodss/yaml v1.0.0
13+
github.com/ghodss/yaml v1.0.1-0.20180820084758-c7ce16629ff4
2714
github.com/go-logr/logr v0.1.0
2815
github.com/go-logr/zapr v0.1.1
29-
github.com/go-openapi/swag v0.19.0 // indirect
30-
github.com/go-sql-driver/mysql v1.4.1 // indirect
3116
github.com/gobuffalo/packr v1.30.1 // indirect
3217
github.com/gobwas/glob v0.2.3 // indirect
33-
github.com/google/uuid v1.1.1 // indirect
34-
github.com/hashicorp/golang-lru v0.5.1 // indirect
3518
github.com/huandu/xstrings v1.2.0 // indirect
3619
github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7
3720
github.com/jmoiron/sqlx v1.2.0 // indirect
38-
github.com/lib/pq v1.1.1 // indirect
39-
github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983 // indirect
21+
github.com/lib/pq v1.2.0 // indirect
4022
github.com/markbates/inflect v1.0.4
4123
github.com/martinlindhe/base36 v0.0.0-20180729042928-5cda0030da17
4224
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
4325
github.com/mattn/go-isatty v0.0.8
26+
github.com/mitchellh/copystructure v1.0.0 // indirect
4427
github.com/mitchellh/go-homedir v1.1.0
45-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
4628
github.com/mitchellh/mapstructure v1.1.2
47-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
48-
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
49-
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190128024246-5eb7ae5bdb7a
29+
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
5030
github.com/operator-framework/operator-registry v1.1.1
5131
github.com/pborman/uuid v1.2.0
52-
github.com/pelletier/go-toml v1.3.0 // indirect
53-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
5432
github.com/pkg/errors v0.8.1
5533
github.com/prometheus/client_golang v1.0.0
56-
github.com/rogpeppe/go-internal v1.3.0
57-
github.com/rubenv/sql-migrate v0.0.0-20190618074426-f4d34eae5a5c // indirect
34+
github.com/rogpeppe/go-internal v1.5.0
35+
github.com/rubenv/sql-migrate v0.0.0-20191022111038-5cdff0d8cc42 // indirect
5836
github.com/sergi/go-diff v1.0.0
5937
github.com/sirupsen/logrus v1.4.2
6038
github.com/spf13/afero v1.2.2
6139
github.com/spf13/cobra v0.0.5
62-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
6340
github.com/spf13/pflag v1.0.3
6441
github.com/spf13/viper v1.4.0
6542
github.com/stretchr/testify v1.3.0
6643
github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect
67-
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
6844
github.com/ziutek/mymysql v1.5.4 // indirect
69-
go.etcd.io/bbolt v1.3.3 // indirect
7045
go.uber.org/zap v1.10.0
71-
golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c
72-
google.golang.org/api v0.3.2 // indirect
73-
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 // indirect
46+
golang.org/x/tools v0.0.0-20191018212557-ed542cd5b28a
7447
gopkg.in/gorp.v1 v1.7.2 // indirect
75-
gopkg.in/square/go-jose.v2 v2.3.0 // indirect
7648
gopkg.in/yaml.v2 v2.2.2
77-
k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
78-
k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
79-
k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
80-
k8s.io/cli-runtime v0.0.0-20181213153952-835b10687cb6
81-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
82-
k8s.io/cloud-provider v0.0.0-00010101000000-000000000000 // indirect
83-
k8s.io/code-generator v0.0.0-20190311093542-50b561225d70
84-
k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a
85-
k8s.io/helm v2.14.1+incompatible
49+
k8s.io/api v0.0.0
50+
k8s.io/apiextensions-apiserver v0.0.0
51+
k8s.io/apimachinery v0.0.0
52+
k8s.io/cli-runtime v0.0.0
53+
k8s.io/client-go v11.0.0+incompatible
54+
k8s.io/code-generator v0.0.0
55+
k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
56+
k8s.io/helm v2.15.0+incompatible
8657
k8s.io/klog v0.3.3
87-
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c
58+
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
8859
k8s.io/kube-state-metrics v1.7.2
89-
k8s.io/kubernetes v1.14.2
90-
sigs.k8s.io/controller-runtime v0.2.0
91-
sigs.k8s.io/controller-tools v0.2.0
92-
sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
93-
vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
60+
k8s.io/kubernetes v1.15.4
61+
sigs.k8s.io/controller-runtime v0.3.0
62+
sigs.k8s.io/controller-tools v0.2.2
9463
)
9564

96-
// Pinned to kubernetes-1.14.1
65+
// Pinned to kubernetes-1.15.4
9766
replace (
98-
k8s.io/api => k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
99-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
100-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
101-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190409021813-1ec86e4da56c
102-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190409023024-d644b00f3b79
103-
k8s.io/client-go => k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
104-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190409023720-1bc0c81fa51d
105-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190311093542-50b561225d70
106-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190409022021-00b8e31abe9d
107-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190510232812-a01b7d5d6c22
108-
k8s.io/kubernetes => k8s.io/kubernetes v1.14.1
67+
k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
68+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
69+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
70+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
71+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
72+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
73+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
74+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
75+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
76+
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
77+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
78+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
79+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
80+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
81+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
82+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
83+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
84+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
85+
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
86+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
10987
)
110-
111-
replace (
112-
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
113-
// down. The github mirror should be used instead.
114-
// Locking to a specific version (from 'go mod graph'):
115-
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
116-
github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
117-
118-
// This replacement is required because various SDK dependencies
119-
// depend on different versions of github.com/ugorji/go and
120-
// github.com/ugorji/go/codec that conflict and break Go tooling
121-
// due to the go.mod changes that have occurred recently in
122-
// github.com/ugorji/go and github.com/ugorji/go/codec.
123-
// See: https://github.com/ugorji/go/issues/299
124-
github.com/ugorji/go => github.com/ugorji/go v1.1.7
125-
github.com/ugorji/go/codec => github.com/ugorji/go/codec v1.1.7
126-
)
127-
128-
// Remove when controller-tools v0.2.2 is released
129-
// Required for the bugfix https://github.com/kubernetes-sigs/controller-tools/pull/322
130-
replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.2-0.20190919011008-6ed4ff330711

0 commit comments

Comments
 (0)