Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump envtest to 1.32 #547

Merged
merged 2 commits into from
Jan 8, 2025
+8 −4
Merged

Bump envtest to 1.32 #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10e0d36
Bump envtest to 1.32
alexander-demicev Jan 7, 2025
83e9180
Merge branch 'main' into bumpenvtest
alexander-demicev Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export GO111MODULE=on
#
# Kubebuilder.
#
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.25.0
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s

Expand Down Expand Up @@ -71,7 +71,7 @@ KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
# Intentionally using a commit from main to use a setup-envtest version
# that uses binaries from controller-tools, not GCS.
# CR PR: https://github.com/kubernetes-sigs/controller-runtime/pull/2811
SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
SETUP_ENVTEST_VER := release-0.19
SETUP_ENVTEST_BIN := setup-envtest
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
Expand Down
8 changes: 6 additions & 2 deletions controlplane/internal/controllers/rke2controlplane_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package controllers

import (
"time"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
Expand All @@ -17,7 +19,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

var _ = Describe("Reconclie control plane conditions", func() {
var _ = Describe("Reconcile control plane conditions", func() {
var (
err error
cp *rke2.ControlPlane
Expand Down Expand Up @@ -135,7 +137,9 @@ var _ = Describe("Reconclie control plane conditions", func() {
},
}
Expect(testEnv.Create(ctx, nodeByRef.DeepCopy())).To(Succeed())
Eventually(testEnv.Get(ctx, client.ObjectKeyFromObject(nodeByRef), nodeByRef)).Should(Succeed())
Eventually(func() error {
return testEnv.Get(ctx, client.ObjectKeyFromObject(nodeByRef), nodeByRef)
}, 5*time.Second).Should(Succeed())
Expect(testEnv.Status().Update(ctx, nodeByRef.DeepCopy())).To(Succeed())

orphanedNode = &corev1.Node{ObjectMeta: metav1.ObjectMeta{
Expand Down
Loading