Update suit_test.go

Signed-off-by: Dharmendra solanki <[email protected]>

Author: ProgrammingPirates

Makefile

@@ -8,7 +8,7 @@ VERSION ?= 0.0.1
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 BIN_DIR := $(PROJECT_DIR)/bin
 
-ENVTEST_K8S_VERSION = 1.29.3
+ENVTEST_K8S_VERSION ?= 1.29.3
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:
@@ -116,8 +116,8 @@ tidy: ## Run go mod tidy against code.
 	go mod tidy
 
 .PHONY: test
-test: manifests generate fmt vet ## Run tests.
-	go test --short ./... -race -coverprofile=coverage.txt -covermode=atomic
+test: test-env manifests generate fmt vet ## Run tests.
+	ENVTEST_K8S_VERSION=$(ENVTEST_K8S_VERSION) go test --short ./... -race -coverprofile=coverage.txt -covermode=atomic
 
 ##@ Build
 

controllers/suit_test.go

@@ -19,13 +19,14 @@ package controllers
 import (
 	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	apiv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	types "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	k8sscheme "k8s.io/client-go/kubernetes/scheme"
@@ -59,6 +60,12 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 
 	By("bootstrapping test environment")
 	timeout := 2 * time.Minute
+	// Get K8s version from environment variable, default to 1.29.3
+	k8sVersion := os.Getenv("ENVTEST_K8S_VERSION")
+	if k8sVersion == "" {
+		k8sVersion = "1.29.3"
+	}
+	binaryAssetsDir := filepath.Join("..", "bin", "k8s", k8sVersion+"-"+runtime.GOOS+"-"+runtime.GOARCH)
 	testEnv = &envtest.Environment{
 		ErrorIfCRDPathMissing: true,
 		CRDDirectoryPaths: []string{
@@ -67,7 +74,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 		ControlPlaneStartTimeout: timeout,
 		ControlPlaneStopTimeout:  timeout,
 		AttachControlPlaneOutput: false,
-		BinaryAssetsDirectory: filepath.Join("..", "bin", "k8s", "1.30.0-linux-amd64"),
+		BinaryAssetsDirectory:    binaryAssetsDir,
 	}
 
 	var cfg *rest.Config
@@ -82,7 +89,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
-	scheme := runtime.NewScheme()
+	scheme := k8sruntime.NewScheme()
 
 	Expect(mesheryv1alpha1.AddToScheme(scheme)).To(Succeed())
 	Expect(k8sscheme.AddToScheme(scheme)).To(Succeed())

pkg/broker/resources.go

@@ -171,7 +171,7 @@ ACSU3Q6LTLBVLGAQUONAGXJHVNWGSKKAUA7IY5TB4Z7PLEKSR5O6JTGR: eyJ0eXAiOiJqd3QiLCJhbG
 			Containers: []corev1.Container{
 				{
 					Name:            "nats",
-				    Image:           "nats:2.8.2-alpine3.15",
+					Image:           "nats:2.10.29-alpine3.22",
 					ImagePullPolicy: corev1.PullIfNotPresent,
 					Ports: []corev1.ContainerPort{
 						{

pkg/broker/suit_test.go

@@ -19,13 +19,14 @@ package broker
 import (
 	"os"
 	"path/filepath"
+	"runtime"
 	"testing"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	apiv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	types "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	k8sscheme "k8s.io/client-go/kubernetes/scheme"
@@ -55,6 +56,12 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 
 	By("bootstrapping test environment")
 	timeout := 3 * time.Minute
+	// Get K8s version from environment variable, default to 1.29.3
+	k8sVersion := os.Getenv("ENVTEST_K8S_VERSION")
+	if k8sVersion == "" {
+		k8sVersion = "1.29.3"
+	}
+	binaryAssetsDir := filepath.Join("..", "..", "bin", "k8s", k8sVersion+"-"+runtime.GOOS+"-"+runtime.GOARCH)
 	testEnv = &envtest.Environment{
 		ErrorIfCRDPathMissing: true,
 		CRDDirectoryPaths: []string{
@@ -63,7 +70,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 		ControlPlaneStartTimeout: timeout,
 		ControlPlaneStopTimeout:  timeout,
 		AttachControlPlaneOutput: false,
-		BinaryAssetsDirectory:    filepath.Join("..", "..", "bin", "k8s", "1.24.2-linux-amd64"),
+		BinaryAssetsDirectory:    binaryAssetsDir,
 	}
 
 	var cfg *rest.Config
@@ -78,7 +85,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
-	scheme := runtime.NewScheme()
+	scheme := k8sruntime.NewScheme()
 
 	Expect(mesheryv1alpha1.AddToScheme(scheme)).To(Succeed())
 	Expect(k8sscheme.AddToScheme(scheme)).To(Succeed())