Skip to content

Commit 2b857cb

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1961 from varshaprasad96/bump-cr/0.8.0
✨ bump controller-runtime to 0.8.3
2 parents b088d4e + 12f9460 commit 2b857cb

28 files changed

+45
-45
lines changed

‎docs/book/src/migration/manually_migration_guide_v2_v3.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,9 @@ require (
359359
github.com/go-logr/logr v0.3.0
360360
github.com/onsi/ginkgo v1.14.1
361361
github.com/onsi/gomega v1.10.2
362-
k8s.io/apimachinery v0.19.2
363-
k8s.io/client-go v0.19.2
364-
sigs.k8s.io/controller-runtime v0.7.0
362+
k8s.io/apimachinery v0.20.2
363+
k8s.io/client-go v0.20.2
364+
sigs.k8s.io/controller-runtime v0.8.3
365365
)
366366
```
367367

‎docs/book/src/migration/migration_guide_v2tov3.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ go mod init tutorial.kubebuilder.io/migration-project
3939
<aside class="note warning">
4040
<h1> Migrating to Kubebuilder v3 while staying on the go/v2 plugin </h1>
4141

42-
You can use `--plugins=go/v2` if you wish to continue using "`Kubebuilder 2.x`" layout and avoid dealing with the breaking changes that will be faced because of the default upper versions which will be used now. See that the [controller-tools][controller-tools] `v0.4.1` & [controller-runtime][controller-runtime] `v0.7.0` are just used by default with the `go/v3` plugin layout.
42+
You can use `--plugins=go/v2` if you wish to continue using "`Kubebuilder 2.x`" layout and avoid dealing with the breaking changes that will be faced because of the default upper versions which will be used now. See that the [controller-tools][controller-tools] `v0.4.1` & [controller-runtime][controller-runtime] `v0.8.3` are just used by default with the `go/v3` plugin layout.
4343
</aside>
4444

4545
<aside class="note">
@@ -128,7 +128,7 @@ func (r *CronJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
128128
<aside class="note warning">
129129
<h1>Controller-runtime version updated has breaking changes</h1>
130130
131-
Check [sigs.k8s.io/controller-runtime release docs from 0.7.0+ version][controller-runtime] for breaking changes.
131+
Check [sigs.k8s.io/controller-runtime release docs from 0.8.0+ version][controller-runtime] for breaking changes.
132132
133133
</aside>
134134

‎docs/book/src/migration/v2vsv3.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Projects scaffolded with Kubebuilder v3 will use the `go.kubebuilder.io/v3` plug
4242
* Manager manifests now use `SecurityContext` to address security concerns. More info: [#1637][issue-1637]
4343
- Misc:
4444
* Support for [controller-tools][controller-tools] `v0.4.1` (for `go/v2` it is `v0.3.0` and previously it was `v0.2.5`)
45-
* Support for [controller-runtime][controller-runtime] `v0.7.0` (for `go/v2` it is `v0.6.4` and previously it was `v0.5.0`)
45+
* Support for [controller-runtime][controller-runtime] `v0.8.3` (for `go/v2` it is `v0.6.4` and previously it was `v0.5.0`)
4646
* Support for [kustomize][kustomize] `v3.8.7` (for `go/v2` it is `v3.5.4` and previously it was `v3.1.0`)
4747
* Required Envtest binaries are automatically downloaded
4848
* The minimum Go version is now `1.15` (previously it was `1.13).

‎pkg/plugins/golang/declarative/v1/api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
const (
3636
// kbDeclarativePattern is the sigs.k8s.io/kubebuilder-declarative-pattern version
3737
kbDeclarativePatternForV2 = "v0.0.0-20200522144838-848d48e5b073"
38-
kbDeclarativePatternForV3 = "v0.0.0-20210113160450-b84d99da0217"
38+
kbDeclarativePatternForV3 = "4ba4cadcd4ca182c7b29c0569c85fbbd2996c762"
3939

4040
exampleManifestVersion = "0.0.1"
4141
)

‎pkg/plugins/golang/v3/scaffolds/init.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
const (
3232
// ControllerRuntimeVersion is the kubernetes-sigs/controller-runtime version to be used in the project
33-
ControllerRuntimeVersion = "v0.7.2"
33+
ControllerRuntimeVersion = "v0.8.3"
3434
// ControllerToolsVersion is the kubernetes-sigs/controller-tools version to be used in the project
3535
ControllerToolsVersion = "v0.4.1"
3636
// KustomizeVersion is the kubernetes-sigs/kustomize version to be used in the project

‎testdata/project-v3-addon/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ vet: ## Run go vet against code.
5252
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
5353
test: manifests generate fmt vet ## Run tests.
5454
mkdir -p ${ENVTEST_ASSETS_DIR}
55-
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
55+
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
5656
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
5757

5858
##@ Build

‎testdata/project-v3-addon/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/apimachinery v0.19.2
10-
k8s.io/client-go v0.19.2
11-
sigs.k8s.io/controller-runtime v0.7.2
12-
sigs.k8s.io/kubebuilder-declarative-pattern v0.0.0-20210113160450-b84d99da0217
9+
k8s.io/apimachinery v0.20.2
10+
k8s.io/client-go v0.20.2
11+
sigs.k8s.io/controller-runtime v0.8.3
12+
sigs.k8s.io/kubebuilder-declarative-pattern v0.0.0-20210322221347-4ba4cadcd4ca
1313
)

‎testdata/project-v3-config/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ vet: ## Run go vet against code.
5252
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
5353
test: manifests generate fmt vet ## Run tests.
5454
mkdir -p ${ENVTEST_ASSETS_DIR}
55-
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
55+
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
5656
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
5757

5858
##@ Build

‎testdata/project-v3-config/controllers/admiral_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type AdmiralReconciler struct {
4646
// the user.
4747
//
4848
// For more details, check Reconcile and its Result here:
49-
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.7.2/pkg/reconcile
49+
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.8.3/pkg/reconcile
5050
func (r *AdmiralReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
5151
_ = r.Log.WithValues("admiral", req.NamespacedName)
5252

‎testdata/project-v3-config/controllers/captain_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type CaptainReconciler struct {
4646
// the user.
4747
//
4848
// For more details, check Reconcile and its Result here:
49-
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.7.2/pkg/reconcile
49+
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.8.3/pkg/reconcile
5050
func (r *CaptainReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
5151
_ = r.Log.WithValues("captain", req.NamespacedName)
5252

0 commit comments

Comments
 (0)