Skip to content

Commit 04629a2

Browse files
joelanfordjoelanford
authored
*: bump to kubernetes 1.16 (#2145)
* *: bump to kubernetes 1.16 * CHANGELOG.md: add changes from #2145, fix errant addition of Deprecated header in 0.12.0 release section * internal/scaffold/crd.go: remove now-unnecessary link replacements * test/test-framework,hack/generate/gen-test-framework.sh: regenerate test-framework for k8s 1.16
1 parent 07147b7 commit 04629a2

File tree

12 files changed

+903
-642
lines changed

12 files changed

+903
-642
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
### Changed
77
- Upgrade minimal Ansible version in the init projects from `2.4` to `2.6`. ([#2107](https://github.com/operator-framework/operator-sdk/pull/2107))
8+
- Upgrade Kubernetes version from `kubernetes-1.15.4` to `kubernetes-1.16.2`. ([#2145](https://github.com/operator-framework/operator-sdk/pull/2145))
9+
- Upgrade Helm version from `v2.15.0` to `v2.16.1`. ([#2145](https://github.com/operator-framework/operator-sdk/pull/2145))
10+
- Upgrade [`controller-runtime`](https://github.com/kubernetes-sigs/controller-runtime) version from `v0.3.0` to [`v0.4.0`](https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.4.0). ([#2145](https://github.com/operator-framework/operator-sdk/pull/2145))
811

912
### Deprecated
1013

@@ -23,8 +26,6 @@
2326
### Changed
2427

2528
- **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))
26-
27-
### Deprecated
2829
- Upgrade Kubernetes version from `kubernetes-1.14.1` to `kubernetes-1.15.4`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
2930
- Upgrade Helm version from `v2.14.1` to `v2.15.0`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
3031
- Upgrade [`controller-runtime`](https://github.com/kubernetes-sigs/controller-runtime) version from `v0.2.0` to [`v0.3.0`](https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.3.0). ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ clean: ## Clean up the build artifacts
5757
gen-cli-doc: ## Generate CLI documentation
5858
./hack/generate/gen-cli-doc.sh
5959

60-
gen-test-framework: install ## Run generate commands to update test/test-framework
60+
gen-test-framework: build/operator-sdk ## Run generate commands to update test/test-framework
6161
./hack/generate/gen-test-framework.sh
6262

6363
generate: gen-cli-doc gen-test-framework ## Run all generate targets

‎go.mod

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,85 +8,83 @@ require (
88
github.com/Masterminds/semver v1.5.0 // indirect
99
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
1010
github.com/blang/semver v3.5.1+incompatible
11-
github.com/coreos/go-semver v0.2.0
12-
github.com/coreos/prometheus-operator v0.29.0
13-
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
14-
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
15-
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
16-
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
17-
github.com/fatih/camelcase v1.0.0 // indirect
18-
github.com/ghodss/yaml v1.0.1-0.20180820084758-c7ce16629ff4
11+
github.com/coreos/go-semver v0.3.0
12+
github.com/coreos/prometheus-operator v0.34.0
13+
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
1914
github.com/go-logr/logr v0.1.0
2015
github.com/go-logr/zapr v0.1.1
2116
github.com/gobuffalo/packr v1.30.1 // indirect
2217
github.com/gobwas/glob v0.2.3 // indirect
18+
github.com/gregjones/httpcache v0.0.0-20190203031600-7a902570cb17 // indirect
2319
github.com/huandu/xstrings v1.2.0 // indirect
24-
github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7
20+
github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365
2521
github.com/jmoiron/sqlx v1.2.0 // indirect
2622
github.com/lib/pq v1.2.0 // indirect
2723
github.com/markbates/inflect v1.0.4
28-
github.com/martinlindhe/base36 v0.0.0-20180729042928-5cda0030da17
24+
github.com/martinlindhe/base36 v1.0.0
2925
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
3026
github.com/mattn/go-isatty v0.0.8
3127
github.com/mitchellh/copystructure v1.0.0 // indirect
3228
github.com/mitchellh/go-homedir v1.1.0
3329
github.com/mitchellh/mapstructure v1.1.2
34-
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
35-
github.com/operator-framework/operator-registry v1.1.1
30+
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20191115003340-16619cd27fa5
31+
github.com/operator-framework/operator-registry v1.5.1
3632
github.com/pborman/uuid v1.2.0
3733
github.com/pkg/errors v0.8.1
38-
github.com/prometheus/client_golang v1.0.0
34+
github.com/prometheus/client_golang v1.1.0
3935
github.com/rogpeppe/go-internal v1.5.0
40-
github.com/rubenv/sql-migrate v0.0.0-20191022111038-5cdff0d8cc42 // indirect
36+
github.com/rubenv/sql-migrate v0.0.0-20191025130928-9355dd04f4b3 // indirect
4137
github.com/sergi/go-diff v1.0.0
4238
github.com/sirupsen/logrus v1.4.2
4339
github.com/spf13/afero v1.2.2
4440
github.com/spf13/cobra v0.0.5
45-
github.com/spf13/pflag v1.0.3
41+
github.com/spf13/pflag v1.0.5
4642
github.com/spf13/viper v1.4.0
47-
github.com/stretchr/testify v1.3.0
43+
github.com/stretchr/testify v1.4.0
4844
github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect
4945
github.com/ziutek/mymysql v1.5.4 // indirect
5046
go.uber.org/zap v1.10.0
5147
golang.org/x/tools v0.0.0-20191018212557-ed542cd5b28a
5248
gopkg.in/gorp.v1 v1.7.2 // indirect
53-
gopkg.in/yaml.v2 v2.2.2
49+
gopkg.in/yaml.v2 v2.2.4
5450
k8s.io/api v0.0.0
5551
k8s.io/apiextensions-apiserver v0.0.0
5652
k8s.io/apimachinery v0.0.0
5753
k8s.io/cli-runtime v0.0.0
58-
k8s.io/client-go v11.0.0+incompatible
54+
k8s.io/client-go v12.0.0+incompatible
5955
k8s.io/code-generator v0.0.0
6056
k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
61-
k8s.io/helm v2.15.0+incompatible
62-
k8s.io/klog v0.3.3
57+
k8s.io/helm v2.16.1+incompatible
58+
k8s.io/klog v1.0.0
6359
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
6460
k8s.io/kube-state-metrics v1.7.2
65-
k8s.io/kubernetes v1.15.4
66-
sigs.k8s.io/controller-runtime v0.3.0
61+
k8s.io/kubectl v0.0.0
62+
k8s.io/kubernetes v1.16.2
63+
sigs.k8s.io/controller-runtime v0.4.0
6764
sigs.k8s.io/controller-tools v0.2.2
6865
)
6966

70-
// Pinned to kubernetes-1.15.4
67+
// Pinned to kubernetes-1.16.2
7168
replace (
72-
k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
73-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
74-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
75-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
76-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
77-
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
78-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
79-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
80-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
81-
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
82-
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
83-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
84-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
85-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
86-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
87-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
88-
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
89-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
90-
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
91-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
69+
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
70+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
71+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
72+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
73+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5
74+
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
75+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458
76+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42
77+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
78+
k8s.io/component-base => k8s.io/component-base v0.0.0-20191016111319-039242c015a9
79+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
80+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191016115521-756ffa5af0bd
81+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191016112429-9587704a8ad4
82+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191016114939-2b2b218dc1df
83+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191016114407-2e83b6f20229
84+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191016114748-65049c67a58b
85+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
86+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191016114556-7841ed97f1b2
87+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191016115753-cf0698c3a16b
88+
k8s.io/metrics => k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e
89+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
9290
)

0 commit comments

Comments
 (0)