Skip to content

Commit 3342e83

Browse files
authored
Merge pull request #10569 from sbueringer/pr-envtest-main
🌱 Use setup-envtest from CR main (05/2024) to use envtest binaries from CT releases
2 parents eaf97bc + 3894076 commit 3342e83

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ KUSTOMIZE_BIN := kustomize
101101
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
102102
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
103103

104-
SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
104+
# This is a commit from CR main (22.05.2024).
105+
# Intentionally using a commit from main to use a setup-envtest version
106+
# that uses binaries from controller-tools, not GCS.
107+
# CR PR: https://github.com/kubernetes-sigs/controller-runtime/pull/2811
108+
SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
105109
SETUP_ENVTEST_BIN := setup-envtest
106110
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
107111
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest

docs/book/src/developer/providers/migrations/v1.7-to-v1.8.md

+3
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ maintainers of providers and consumers of our Go API.
2424
### Suggested changes for providers
2525

2626
- From Cluster API v1.7 the manager pods are created with `terminationMessagePolicy` set to `FallbackToLogsOnError` for the manager container. This offers the chance that the pod's termination message will contain something useful if the manager exits unexpectedly, which in turn makes debugging easier. We also recommend this setting to provider managers. For an example, see the corresponding change in [CAPV](https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/pull/2988) or [CAPO](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/pull/2070).
27+
- It's highly recommended to move to a new setup-envtest version that uses envtest binaries from controller-tools releases
28+
instead of the deprecated GCS bucket. More details can be found in [#10569](https://github.com/kubernetes-sigs/cluster-api/pull/10569)
29+
and [kubernetes-sigs/controller-runtime#2811](https://github.com/kubernetes-sigs/controller-runtime/pull/2811).

0 commit comments

Comments
 (0)