Merge branch 'master' into upgrade-nats-image-v2.10

ProgrammingPirates · web-flow · commit 199c29b6ea6f · 2025-10-18T20:42:27.000+05:30
Signed-off-by: Dharmendra solanki &lt;78801686+ProgrammingPirates@users.noreply.github.com&gt;
diff --git a/Makefile b/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.24.2
+ENVTEST_K8S_VERSION = 1.30.0
 # 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:
diff --git a/UPGRADE_NOTES.md b/UPGRADE_NOTES.md
diff --git a/controllers/suit_test.go b/controllers/suit_test.go
@@ -67,7 +67,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 		ControlPlaneStartTimeout: timeout,
 		ControlPlaneStopTimeout:  timeout,
 		AttachControlPlaneOutput: false,
-		BinaryAssetsDirectory:    filepath.Join("..", "bin", "k8s", "1.24.2-linux-amd64"),
+		BinaryAssetsDirectory:    filepath.Join("..", "bin", "k8s", "1.30.0-linux-amd64"),
 	}
 
 	var cfg *rest.Config
diff --git a/main.go b/main.go
@@ -28,6 +28,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	mesheryv1alpha1 "github.com/meshery/meshery-operator/api/v1alpha1"
@@ -62,7 +63,9 @@ func main() {
 	opID := uuid.NewUUID()
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme: scheme,
-		MetricsBindAddress: metricsAddr,
+		Metrics: server.Options{
+			BindAddress: metricsAddr,
+		},
 		WebhookServer: webhook.NewServer(webhook.Options{
 			Port: 9443,
 		}),
diff --git a/pkg/broker/suit_test.go b/pkg/broker/suit_test.go
@@ -63,7 +63,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {
 		ControlPlaneStartTimeout: timeout,
 		ControlPlaneStopTimeout:  timeout,
 		AttachControlPlaneOutput: false,
-		BinaryAssetsDirectory:    filepath.Join("..", "..", "bin", "k8s", "1.24.2-linux-amd64"),
+		BinaryAssetsDirectory:    filepath.Join("..", "..", "bin", "k8s", "1.30.0-linux-amd64"),
 	}
 
 	var cfg *rest.Config

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {`
`67`	`67`	`ControlPlaneStartTimeout: timeout,`
`68`	`68`	`ControlPlaneStopTimeout: timeout,`
`69`	`69`	`AttachControlPlaneOutput: false,`
`70`		`- BinaryAssetsDirectory: filepath.Join("..", "bin", "k8s", "1.24.2-linux-amd64"),`
	`70`	`+ BinaryAssetsDirectory: filepath.Join("..", "bin", "k8s", "1.30.0-linux-amd64"),`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`var cfg *rest.Config`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ var _ = BeforeSuite(func(ctx SpecContext) {`
`63`	`63`	`ControlPlaneStartTimeout: timeout,`
`64`	`64`	`ControlPlaneStopTimeout: timeout,`
`65`	`65`	`AttachControlPlaneOutput: false,`
`66`		`- BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", "1.24.2-linux-amd64"),`
	`66`	`+ BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", "1.30.0-linux-amd64"),`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`var cfg *rest.Config`