Skip to content

Commit 0585060

Browse files
varshaprasad96Eric Stroczynski
andauthored
bump kb to latest commit and projects to k8s 1.20 (#4863)
Signed-off-by: varshaprasad96 <[email protected]> Co-authored-by: Eric Stroczynski <[email protected]>
1 parent e96a293 commit 0585060

File tree

7 files changed

+235
-146
lines changed

7 files changed

+235
-146
lines changed

changelog/fragments/bump-kb.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# entries is a list of entries to include in
2+
# release notes and/or the migration guide
3+
entries:
4+
- description: >
5+
(go/v3, ansible/v1, helm/v1) Bumped controller-runtime to v0.8.3 (kubernetes 1.20)
6+
7+
# kind is one of:
8+
# - addition
9+
# - change
10+
# - deprecation
11+
# - removal
12+
# - bugfix
13+
kind: "change"
14+
15+
# Is this a breaking change?
16+
breaking: false
17+
18+
# Migration can be defined to automatically add a section to
19+
# the migration guide. This is required for breaking changes.
20+
migration:
21+
header: (go/v3) Bump controller-runtime to v0.8.3 and kubernetes dependencies to v0.20.2
22+
body: >
23+
In your go.mod, change controller-runtime's version to v0.8.3 and kubernetes dependencies
24+
to v0.20.2, then rebuild your project.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
rsc.io/letsencrypt v0.0.3 // indirect
3838
sigs.k8s.io/controller-runtime v0.8.3
3939
sigs.k8s.io/controller-tools v0.5.0
40-
sigs.k8s.io/kubebuilder/v3 v3.0.0
40+
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20210503171920-2b857cb37698
4141
sigs.k8s.io/yaml v1.2.0
4242
)
4343

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,8 +1563,8 @@ sigs.k8s.io/controller-tools v0.4.1 h1:VkuV0MxlRPmRu5iTgBZU4UxUX2LiR99n3sdQGRxZF
15631563
sigs.k8s.io/controller-tools v0.4.1/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU=
15641564
sigs.k8s.io/controller-tools v0.5.0 h1:3u2RCwOlp0cjCALAigpOcbAf50pE+kHSdueUosrC/AE=
15651565
sigs.k8s.io/controller-tools v0.5.0/go.mod h1:JTsstrMpxs+9BUj6eGuAaEb6SDSPTeVtUyp0jmnAM/I=
1566-
sigs.k8s.io/kubebuilder/v3 v3.0.0 h1:jCXjBl04Dd2anjv9aZQwayqu7ibPeHm2iSxPOGkzmpc=
1567-
sigs.k8s.io/kubebuilder/v3 v3.0.0/go.mod h1:KJLAKkOvgXZ2+1REJqFmoseez1tgg5Qoz0zFeJorrSo=
1566+
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20210503171920-2b857cb37698 h1:l98aP8BgRV8/iBvrbbDPtOYuBrWrjg4QQHnTbFVTpfs=
1567+
sigs.k8s.io/kubebuilder/v3 v3.0.0-alpha.0.0.20210503171920-2b857cb37698/go.mod h1:KJLAKkOvgXZ2+1REJqFmoseez1tgg5Qoz0zFeJorrSo=
15681568
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
15691569
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
15701570
sigs.k8s.io/kustomize/kyaml v0.10.10 h1:caAxDDkaXZp+0kDsZVik4leFJV8LCy09PdVqpaoNeF4=

testdata/go/v3/memcached-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ vet: ## Run go vet against code.
8888
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
8989
test: manifests generate fmt vet ## Run tests.
9090
mkdir -p ${ENVTEST_ASSETS_DIR}
91-
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.2/hack/setup-envtest.sh
91+
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.8.3/hack/setup-envtest.sh
9292
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
9393

9494
##@ Build

testdata/go/v3/memcached-operator/controllers/memcached_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ type MemcachedReconciler struct {
5656
// the user.
5757
//
5858
// For more details, check Reconcile and its Result here:
59-
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.7.2/pkg/reconcile
59+
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.8.3/pkg/reconcile
6060
func (r *MemcachedReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
6161
log := r.Log.WithValues("memcached", req.NamespacedName)
6262

testdata/go/v3/memcached-operator/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/go-logr/logr v0.3.0
77
github.com/onsi/ginkgo v1.14.1
88
github.com/onsi/gomega v1.10.2
9-
k8s.io/api v0.19.2
10-
k8s.io/apimachinery v0.19.2
11-
k8s.io/client-go v0.19.2
12-
sigs.k8s.io/controller-runtime v0.7.2
9+
k8s.io/api v0.20.2
10+
k8s.io/apimachinery v0.20.2
11+
k8s.io/client-go v0.20.2
12+
sigs.k8s.io/controller-runtime v0.8.3
1313
)

0 commit comments

Comments
 (0)