Skip to content

Commit 16200b3

Browse files
authored
Merge pull request #692 from liranmauda/liran-bump-k8s
Bumping k8s to 1.20.2 and controller-runtime to 0.8.3
2 parents 2e23ef2 + 01e5716 commit 16200b3

File tree

15 files changed

+332
-212
lines changed

15 files changed

+332
-212
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ BIN ?= $(OUTPUT)/bin
2323
OLM ?= $(OUTPUT)/olm
2424
VENV ?= $(OUTPUT)/venv
2525

26+
# OPERATOR_SDK_VERSION is for build perpuse only, the dependencies themself are
27+
# updated to a new version as stated in the go.mod file
2628
export OPERATOR_SDK_VERSION ?= v0.17.2
2729
export OPERATOR_SDK ?= build/_tools/operator-sdk-$(OPERATOR_SDK_VERSION)
2830

go.mod

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,66 @@ require (
1010
github.com/Azure/go-autorest/autorest/adal v0.9.5
1111
github.com/Azure/go-autorest/autorest/to v0.3.1-0.20191028180845-3492b2aff503
1212
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535
13-
github.com/aws/aws-sdk-go v1.35.5
13+
github.com/aws/aws-sdk-go v1.37.14
1414
github.com/blang/semver v3.5.1+incompatible
1515
github.com/coreos/go-semver v0.3.0
1616
github.com/coreos/prometheus-operator v0.38.1-0.20200424145508-7e176fda06cc
1717
github.com/docker/distribution v2.7.1+incompatible
18-
github.com/go-logr/zapr v0.1.1 // indirect
1918
github.com/go-openapi/spec v0.19.8
2019
github.com/hashicorp/vault/api v1.0.5-0.20200902155336-f9d5ce5a171a
21-
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20210127170128-83a4fdf6edd6
20+
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20210311161930-4bea5edaff58
2221
github.com/marstr/randname v0.0.0-20200428202425-99aca53a2176
2322
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
24-
github.com/openshift/cloud-credential-operator v0.0.0-20190614194054-1ccced634f6c
23+
github.com/openshift/cloud-credential-operator v0.0.0-20210716145643-0ee1808fb8ed
2524
github.com/openshift/custom-resource-status v0.0.0-20190801200128-4c95b3a336cd
2625
github.com/operator-framework/api v0.3.22
2726
github.com/operator-framework/operator-lib v0.2.0
28-
github.com/rook/rook v1.5.3
27+
github.com/rook/rook v1.6.5
2928
github.com/sirupsen/logrus v1.6.0
30-
github.com/spf13/cobra v1.0.0
29+
github.com/spf13/cobra v1.1.1
3130
github.com/spf13/pflag v1.0.5
3231
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
3332
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
3433
google.golang.org/api v0.32.0
35-
k8s.io/api v0.19.3
36-
k8s.io/apiextensions-apiserver v0.19.3
37-
k8s.io/apimachinery v0.19.3
38-
k8s.io/cli-runtime v0.19.3
34+
k8s.io/api v0.20.2
35+
k8s.io/apiextensions-apiserver v0.20.2
36+
k8s.io/apimachinery v0.20.2
37+
k8s.io/cli-runtime v0.20.2
3938
k8s.io/client-go v12.0.0+incompatible
40-
k8s.io/code-generator v0.20.1
41-
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14
42-
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
43-
k8s.io/kubectl v0.18.8
39+
k8s.io/code-generator v0.20.2
40+
k8s.io/gengo v0.0.0-20201113003025-83324d819ded
41+
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
42+
k8s.io/kubectl v0.20.2
4443
nhooyr.io/websocket v1.7.4
45-
sigs.k8s.io/controller-runtime v0.6.3
44+
sigs.k8s.io/controller-runtime v0.8.3
4645
sigs.k8s.io/yaml v1.2.0
4746
)
4847

49-
// Pinned to kubernetes-1.19.3
48+
// Pinned to kubernetes-1.20.2
5049
replace (
5150
github.com/moby/term => github.com/moby/term v0.0.0-20201110203204-bea5bbe245bf // indirect
52-
k8s.io/api => k8s.io/api v0.19.3
53-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.3
54-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.3
55-
k8s.io/apiserver => k8s.io/apiserver v0.19.3
56-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.3
57-
k8s.io/client-go => k8s.io/client-go v0.19.3 // Required by prometheus-operator
58-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.3
59-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.3
60-
k8s.io/code-generator => k8s.io/code-generator v0.19.3
61-
k8s.io/component-base => k8s.io/component-base v0.19.3
62-
k8s.io/cri-api => k8s.io/cri-api v0.19.3
63-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.3
64-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.3
65-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.3
66-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.3
67-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.3
68-
k8s.io/kubectl => k8s.io/kubectl v0.19.3
69-
k8s.io/kubelet => k8s.io/kubelet v0.19.3
70-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.3
71-
k8s.io/metrics => k8s.io/metrics v0.19.3
72-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.3
73-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.2
51+
k8s.io/api => k8s.io/api v0.20.2
52+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
53+
k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
54+
k8s.io/apiserver => k8s.io/apiserver v0.20.2
55+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
56+
k8s.io/client-go => k8s.io/client-go v0.20.2
57+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
58+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
59+
k8s.io/code-generator => k8s.io/code-generator v0.20.2
60+
k8s.io/component-base => k8s.io/component-base v0.20.2
61+
k8s.io/component-helpers => k8s.io/component-helpers v0.20.2
62+
k8s.io/controller-manager => k8s.io/controller-manager v0.20.2
63+
k8s.io/cri-api => k8s.io/cri-api v0.20.2
64+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
65+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
66+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
67+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
68+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
69+
k8s.io/kubectl => k8s.io/kubectl v0.20.2
70+
k8s.io/kubelet => k8s.io/kubelet v0.20.2
71+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
72+
k8s.io/metrics => k8s.io/metrics v0.20.2
73+
k8s.io/mount-utils => k8s.io/mount-utils v0.20.2
74+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
7475
)

0 commit comments

Comments
 (0)