Skip to content

Commit

Permalink
Bump envtest to 1.32
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandr Demicev <[email protected]>
  • Loading branch information
alexander-demicev committed Jan 8, 2025
1 parent b1d4cfa commit 10e0d36
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
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
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

0 comments on commit 10e0d36

Please sign in to comment.