Update the kubernetes to v1.30 and controller runtime to v0.18 (#1112)

Author: prafull01

.bazeliskrc

@@ -1 +1 @@
-USE_BAZEL_VERSION=5.4.0
+USE_BAZEL_VERSION=6.5.0

.golangci.yaml

@@ -13,4 +13,4 @@
 # limitations under the License.
 linters-settings:
   staticcheck:
-    go: "1.17"
+    go: "1.24"

Makefile

@@ -244,7 +244,7 @@ dev/update-codegen:
 .PHONY: dev/update-crds
 dev/update-crds:
 	@bazel run //hack/bin:controller-gen \
-		crd:trivialVersions=true \
+		crd \
 		rbac:roleName=role \
 		webhook \
 		paths=./... \

WORKSPACE

@@ -1,10 +1,11 @@
 workspace(name = "com_github_coachroachdb_cockroach_operator")
 
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
 #####################################
 # Bazel macros for downloading deps #
 #####################################
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
     name = "com_google_protobuf",
@@ -45,10 +46,10 @@ bazel_skylib_workspace()
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "33acc4ae0f70502db4b893c9fc1dd7a9bf998c23e7ff2c4517741d4049a976f8",
+    sha256 = "f2d15bea3e241aa0e3a90fb17a82e6a8ab12214789f6aeddd53b8d04316d2b7c",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.48.0/rules_go-v0.48.0.zip",
+        "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.54.0/rules_go-v0.54.0.zip",
+        "https://github.com/bazel-contrib/rules_go/releases/download/v0.54.0/rules_go-v0.54.0.zip",
     ],
 )
 
@@ -73,11 +74,10 @@ go_rules_dependencies()
 # gazelle:repository_macro hack/build/repos.bzl%_go_dependencies
 go_dependencies()
 
-go_register_toolchains(version = "1.22.3")
+go_register_toolchains(version = "1.24.2")
 
 gazelle_dependencies()
 
-
 ################################
 # begin rules_oci dependencies #
 ################################

apis/v1alpha1/BUILD.bazel

@@ -29,6 +29,7 @@ go_library(
         "@io_k8s_sigs_controller_runtime//pkg/log:go_default_library",
         "@io_k8s_sigs_controller_runtime//pkg/scheme:go_default_library",
         "@io_k8s_sigs_controller_runtime//pkg/webhook:go_default_library",
+        "@io_k8s_sigs_controller_runtime//pkg/webhook/admission:go_default_library",
     ],
 )
 

apis/v1alpha1/webhook.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 
@@ -26,6 +27,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 var (
@@ -44,19 +46,24 @@ var (
 	webhookLog = logf.Log.WithName("webhooks")
 
 	// this just ensures that we've implemented the interface
-	_ webhook.Defaulter = &CrdbCluster{}
-	_ webhook.Validator = &CrdbCluster{}
+	_ webhook.CustomDefaulter = &CrdbCluster{}
+	_ webhook.CustomValidator = &CrdbCluster{}
 )
 
 // SetupWebhookWithManager ensures webhooks are enabled for the CrdbCluster resource.
 func (r *CrdbCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewWebhookManagedBy(mgr).For(r).Complete()
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
+		WithDefaulter(r).
+		WithValidator(r).
+		Complete()
 }
 
 // +kubebuilder:webhook:path=/mutate-crdb-cockroachlabs-com-v1alpha1-crdbcluster,mutating=true,failurePolicy=fail,groups=crdb.cockroachlabs.com,resources=crdbclusters,verbs=create;update,versions=v1alpha1,name=mcrdbcluster.kb.io,sideEffects=None,admissionReviewVersions=v1
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (r *CrdbCluster) Default() {
+func (r *CrdbCluster) Default(ctx context.Context, obj runtime.Object) error {
+	r = obj.(*CrdbCluster)
 	webhookLog.Info("default", "name", r.Name)
 
 	if r.Spec.GRPCPort == nil {
@@ -79,12 +86,15 @@ func (r *CrdbCluster) Default() {
 		policy := v1.PullIfNotPresent
 		r.Spec.Image.PullPolicyName = &policy
 	}
+
+	return nil
 }
 
 // +kubebuilder:webhook:path=/validate-crdb-cockroachlabs-com-v1alpha1-crdbcluster,mutating=false,failurePolicy=fail,groups=crdb.cockroachlabs.com,resources=crdbclusters,verbs=create;update,versions=v1alpha1,name=vcrdbcluster.kb.io,sideEffects=None,admissionReviewVersions=v1
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *CrdbCluster) ValidateCreate() error {
+func (r *CrdbCluster) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r = obj.(*CrdbCluster)
 	webhookLog.Info("validate create", "name", r.Name)
 	var errors []error
 	if r.Spec.Ingress != nil {
@@ -102,20 +112,21 @@ func (r *CrdbCluster) ValidateCreate() error {
 	}
 
 	if len(errors) != 0 {
-		return kerrors.NewAggregate(errors)
+		return nil, kerrors.NewAggregate(errors)
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *CrdbCluster) ValidateUpdate(old runtime.Object) error {
+func (r *CrdbCluster) ValidateUpdate(ctx context.Context, oldObj runtime.Object, newObj runtime.Object) (admission.Warnings, error) {
+	r = newObj.(*CrdbCluster)
 	webhookLog.Info("validate update", "name", r.Name)
 	var errors []error
 
-	oldCluster, ok := old.(*CrdbCluster)
+	oldCluster, ok := oldObj.(*CrdbCluster)
 	if !ok {
-		webhookLog.Info(fmt.Sprintf("unexpected old cluster type %T", old))
+		webhookLog.Info(fmt.Sprintf("unexpected old cluster type %T", oldObj))
 	} else {
 		// Validate if labels changed.
 		// k8s does not support changing selector/labels on sts:
@@ -136,18 +147,19 @@ func (r *CrdbCluster) ValidateUpdate(old runtime.Object) error {
 	}
 
 	if len(errors) != 0 {
-		return kerrors.NewAggregate(errors)
+		return nil, kerrors.NewAggregate(errors)
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *CrdbCluster) ValidateDelete() error {
+func (r *CrdbCluster) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r = obj.(*CrdbCluster)
 	webhookLog.Info("validate delete", "name", r.Name)
 
 	// we're not validating anything on delete. This is just a placeholder for now to satisfy the Validator interface
-	return nil
+	return nil, nil
 }
 
 // ValidateIngress validates the ingress configuration used to create ingress resource

apis/v1alpha1/webhook_test.go

@@ -17,13 +17,13 @@ limitations under the License.
 package v1alpha1_test
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
 	. "github.com/cockroachdb/cockroach-operator/apis/v1alpha1"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 func TestCrdbClusterDefault(t *testing.T) {
@@ -43,7 +43,8 @@ func TestCrdbClusterDefault(t *testing.T) {
 		Image:          &PodImage{PullPolicyName: &policy},
 	}
 
-	cluster.Default()
+	ctx := context.Background()
+	_ = cluster.Default(ctx, cluster)
 	require.Equal(t, expected, cluster.Spec)
 }
 
@@ -137,8 +138,9 @@ func TestCreateCrdbCluster(t *testing.T) {
 		},
 	}
 
+	ctx := context.Background()
 	for _, testcase := range testcases {
-		err := testcase.Cluster.ValidateCreate()
+		_, err := testcase.Cluster.ValidateCreate(ctx, testcase.Cluster)
 		if testcase.ErrMsg == "" {
 			require.NoError(t, err)
 			continue
@@ -176,8 +178,9 @@ func TestUpdateCrdbCluster(t *testing.T) {
 		},
 	}
 
+	ctx := context.Background()
 	for _, testcase := range testcases {
-		err := testcase.Cluster.ValidateUpdate(&oldCluster)
+		_, err := testcase.Cluster.ValidateUpdate(ctx, &oldCluster, testcase.Cluster)
 		require.Error(t, err)
 		require.Equal(t, err.Error(), testcase.ErrMsg)
 	}
@@ -258,8 +261,9 @@ func TestUpdateCrdbClusterLabels(t *testing.T) {
 		},
 	}
 
+	ctx := context.Background()
 	for _, tc := range testcases {
-		err := tc.Cluster.ValidateUpdate(runtime.Object(&oldCluster))
+		_, err := tc.Cluster.ValidateUpdate(ctx, &oldCluster, tc.Cluster)
 		if tc.ShouldError {
 			require.Error(t, err)
 			require.Equal(t, err.Error(), "mutating additionalLabels field is not supported")

cmd/cockroach-operator/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
-load("@io_bazel_rules_go//go:def.bzl","go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@rules_oci//oci:defs.bzl", "oci_image", "oci_image_index")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 
@@ -44,6 +44,8 @@ go_library(
         "@io_k8s_sigs_controller_runtime//:go_default_library",
         "@io_k8s_sigs_controller_runtime//pkg/cache:go_default_library",
         "@io_k8s_sigs_controller_runtime//pkg/log/zap:go_default_library",
+        "@io_k8s_sigs_controller_runtime//pkg/metrics/server:go_default_library",
+        "@io_k8s_sigs_controller_runtime//pkg/webhook:go_default_library",
     ],
 )
 
@@ -67,26 +69,26 @@ oci_image(
     name = "cockroach_image_linux_amd64",
     # References container_pull from WORKSPACE
     base = "@redhat_ubi_minimal_linux_amd64",
+    entrypoint = ["./cockroach-operator"],
     labels = ":labels",
     tars = [
         ":licenses",
         "//cmd/cockroach-operator/linux-amd64:cockroach-linux-amd64-tar",
         ":operator_image_linux_amd64",
     ],
-    entrypoint = ["./cockroach-operator"],
 )
 
 oci_image(
     name = "cockroach_image_linux_arm64",
     # References container_pull from WORKSPACE
     base = "@redhat_ubi_minimal_linux_arm64",
+    entrypoint = ["./cockroach-operator"],
     labels = ":labels",
     tars = [
         ":licenses",
         "//cmd/cockroach-operator/linux-arm64:cockroach-linux-arm64-tar",
         ":operator_image_linux_arm64",
     ],
-    entrypoint = ["./cockroach-operator"],
 )
 
 pkg_tar(

cmd/cockroach-operator/main.go

@@ -31,6 +31,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 const (
@@ -52,6 +54,7 @@ func init() {
 func main() {
 	var metricsAddr, featureGatesString, leaderElectionID string
 	var enableLeaderElection, skipWebhookConfig bool
+	var err error
 
 	// use zap logging cli options
 	opts := zap.Options{}
@@ -88,19 +91,31 @@ func main() {
 	watchNamespace := os.Getenv(watchNamespaceEnvVar)
 
 	mgrOpts := ctrl.Options{
-		Scheme:             scheme,
-		Namespace:          watchNamespace,
-		MetricsBindAddress: metricsAddr,
-		LeaderElection:     enableLeaderElection,
-		LeaderElectionID:   leaderElectionID,
-		Port:               9443,
-		CertDir:            certDir,
+		Scheme: scheme,
+		Cache: cache.Options{
+			DefaultNamespaces: map[string]cache.Config{
+				watchNamespace: cache.Config{},
+			},
+		},
+		Metrics: server.Options{
+			BindAddress: metricsAddr,
+		},
+		LeaderElection:   enableLeaderElection,
+		LeaderElectionID: leaderElectionID,
+		WebhookServer: webhook.NewServer(webhook.Options{
+			Port:    9443,
+			CertDir: certDir,
+		}),
 	}
 
 	if strings.Contains(watchNamespace, ",") {
 		setupLog.Info("manager set up with multiple namespaces", "namespaces", watchNamespace)
-		mgrOpts.Namespace = ""
-		mgrOpts.NewCache = cache.MultiNamespacedCacheBuilder(strings.Split(watchNamespace, ","))
+		namespaces := strings.Split(watchNamespace, ",")
+		for _, ns := range namespaces {
+			setupLog.Info("watching namespace", "namespace", ns)
+			mgrOpts.Cache.DefaultNamespaces[ns] = cache.Config{}
+		}
+		mgrOpts.NewCache = cache.New
 	}
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), mgrOpts)