controller-runtime upgrade.

apis/k8ssandra/v1alpha1/k8ssandracluster_types_test.go

@@ -1,13 +1,14 @@
 package v1alpha1
 
 import (
-	"sigs.k8s.io/yaml"
 	"testing"
 
+	"k8s.io/utils/ptr"
+	"sigs.k8s.io/yaml"
+
 	cassdcapi "github.com/k8ssandra/cass-operator/apis/cassandra/v1beta1"
 	stargateapi "github.com/k8ssandra/k8ssandra-operator/apis/stargate/v1alpha1"
 	"github.com/stretchr/testify/assert"
-	"k8s.io/utils/pointer"
 )
 
 func TestK8ssandraCluster(t *testing.T) {
@@ -77,7 +78,7 @@ func TestNetworkingConfig_ToCassNetworkingConfig(t *testing.T) {
 		{
 			"host network true",
 			&NetworkingConfig{
-				HostNetwork: pointer.Bool(true),
+				HostNetwork: ptr.To(true),
 			},
 			&cassdcapi.NetworkingConfig{
 				HostNetwork: true,
@@ -86,7 +87,7 @@ func TestNetworkingConfig_ToCassNetworkingConfig(t *testing.T) {
 		{
 			"host network false",
 			&NetworkingConfig{
-				HostNetwork: pointer.Bool(false),
+				HostNetwork: ptr.To(false),
 			},
 			&cassdcapi.NetworkingConfig{
 				HostNetwork: false,
@@ -104,7 +105,7 @@ func TestNetworkingConfig_ToCassNetworkingConfig(t *testing.T) {
 		{
 			"all set",
 			&NetworkingConfig{
-				HostNetwork: pointer.Bool(true),
+				HostNetwork: ptr.To(true),
 				NodePort: &cassdcapi.NodePortConfig{
 					Native:       1,
 					NativeSSL:    2,

apis/k8ssandra/v1alpha1/k8ssandracluster_webhook.go

@@ -29,6 +29,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 (
@@ -64,10 +65,10 @@ func (r *K8ssandraCluster) Default() {
 var _ webhook.Validator = &K8ssandraCluster{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *K8ssandraCluster) ValidateCreate() error {
+func (r *K8ssandraCluster) ValidateCreate() (admission.Warnings, error) {
 	webhookLog.Info("validate K8ssandraCluster create", "K8ssandraCluster", r.Name)
 
-	return r.validateK8ssandraCluster()
+	return nil, r.validateK8ssandraCluster()
 }
 
 func (r *K8ssandraCluster) validateK8ssandraCluster() error {
@@ -128,24 +129,24 @@ func (r *K8ssandraCluster) validateStatefulsetNameSize() error {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *K8ssandraCluster) ValidateUpdate(old runtime.Object) error {
+func (r *K8ssandraCluster) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	webhookLog.Info("validate K8ssandraCluster update", "K8ssandraCluster", r.Name)
 
 	if err := r.validateK8ssandraCluster(); err != nil {
-		return err
+		return nil, err
 	}
 
 	oldCluster, ok := old.(*K8ssandraCluster)
 	if !ok {
-		return fmt.Errorf("previous object could not be casted to K8ssandraCluster")
+		return nil, fmt.Errorf("previous object could not be casted to K8ssandraCluster")
 	}
 
 	// Verify Reaper keyspace is not changed
 	oldReaperSpec := oldCluster.Spec.Reaper
 	reaperSpec := r.Spec.Reaper
 	if reaperSpec != nil && oldReaperSpec != nil {
 		if reaperSpec.Keyspace != oldReaperSpec.Keyspace {
-			return ErrReaperKeyspace
+			return nil, ErrReaperKeyspace
 		}
 	}
 
@@ -158,22 +159,22 @@ func (r *K8ssandraCluster) ValidateUpdate(old runtime.Object) error {
 		if !oldNumTokensExists {
 			cassVersion, err := semver.NewVersion(oldCluster.Spec.Cassandra.ServerVersion)
 			if err != nil {
-				return err
+				return nil, err
 			}
 			defaultNumTokens := oldCluster.DefaultNumTokens(cassVersion)
 			if newNumTokensExists && newNumTokens.(float64) != defaultNumTokens {
-				return ErrNumTokens
+				return nil, ErrNumTokens
 			}
 		} else {
 			if oldNumTokens != newNumTokens {
-				return ErrNumTokens
+				return nil, ErrNumTokens
 			}
 		}
 	}
 
 	// Verify that the cluster name override was not changed
 	if r.Spec.Cassandra.ClusterName != oldCluster.Spec.Cassandra.ClusterName {
-		return ErrClusterName
+		return nil, ErrClusterName
 	}
 
 	// Some of these could be extracted in the cass-operator to reusable methods, do not copy code here.
@@ -185,16 +186,16 @@ func (r *K8ssandraCluster) ValidateUpdate(old runtime.Object) error {
 	// TODO Racks can only be added and only at the end of the list - no other operation is allowed to racks
 
 	if err := r.validateStatefulsetNameSize(); err != nil {
-		return err
+		return nil, err
 	}
 
-	return nil
+	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *K8ssandraCluster) ValidateDelete() error {
+func (r *K8ssandraCluster) ValidateDelete() (admission.Warnings, error) {
 	webhookLog.Info("validate K8ssandraCluster delete", "name", r.Name)
-	return nil
+	return nil, nil
 }
 
 func (r *K8ssandraCluster) ValidateMedusa() error {

apis/k8ssandra/v1alpha1/k8ssandracluster_webhook_test.go

@@ -32,6 +32,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
 	admissionv1 "k8s.io/api/admission/v1"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	//+kubebuilder:scaffold:imports
 	corev1 "k8s.io/api/core/v1"
@@ -103,13 +105,20 @@ func TestWebhook(t *testing.T) {
 
 	// start webhook server using Manager
 	webhookInstallOptions := &testEnv.WebhookInstallOptions
+
+	whServer := webhook.NewServer(webhook.Options{
+		Port:    webhookInstallOptions.LocalServingPort,
+		Host:    webhookInstallOptions.LocalServingHost,
+		CertDir: webhookInstallOptions.LocalServingCertDir,
+	})
+
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:             scheme,
-		Host:               webhookInstallOptions.LocalServingHost,
-		Port:               webhookInstallOptions.LocalServingPort,
-		CertDir:            webhookInstallOptions.LocalServingCertDir,
-		LeaderElection:     false,
-		MetricsBindAddress: "0",
+		Scheme:         scheme,
+		WebhookServer:  whServer,
+		LeaderElection: false,
+		Metrics: server.Options{
+			BindAddress: "0",
+		},
 	})
 	required.NoError(err)
 
@@ -282,7 +291,7 @@ func testNumTokens(t *testing.T) {
 
 	// Handle new num_token value different from previously specified as nil
 	required.NotEqual(oldCassConfig.CassandraYaml["num_tokens"], newCassConfig.CassandraYaml["num_tokens"])
-	var errorWhenNew = (*newCluster).ValidateUpdate(oldCluster)
+	var _, errorWhenNew = (*newCluster).ValidateUpdate(oldCluster)
 	required.Error(errorWhenNew, "expected error having new num_token value different from previous specified as nil")
 
 	oldCluster.Spec.Cassandra.DatacenterOptions.CassandraConfig.CassandraYaml["num_tokens"] = tokens
@@ -293,30 +302,30 @@ func testNumTokens(t *testing.T) {
 
 	// Handle new num_token value different from previously specified as an actual value
 	required.NotEqual(oldCassConfig.CassandraYaml["num_tokens"], newCassConfig.CassandraYaml["num_tokens"])
-	errorWhenNew = (*newCluster).ValidateUpdate(oldCluster)
+	_, errorWhenNew = (*newCluster).ValidateUpdate(oldCluster)
 	required.Error(errorWhenNew, "expected error having new num_token value different from previous specified")
 
 	// Handle new num_token not specified when previously specified
 	oldCassConfig.CassandraYaml["num_tokens"] = tokens
 	delete(newCassConfig.CassandraYaml, "num_tokens")
 
-	var errorWhenNil = (*newCluster).ValidateUpdate(oldCluster)
+	var _, errorWhenNil = (*newCluster).ValidateUpdate(oldCluster)
 	required.Error(errorWhenNil, "expected error having new num_token value as nil from previous specified")
 
 	oldCassConfig.CassandraYaml["num_tokens"] = tokens
 	newCassConfig.CassandraYaml = unstructured.Unstructured{}
 
-	errorWhenNil = (*newCluster).ValidateUpdate(oldCluster)
+	_, errorWhenNil = (*newCluster).ValidateUpdate(oldCluster)
 	required.Error(errorWhenNil, "expected error having new num_token value as nil from previous specified")
 
 	oldCassConfig.CassandraYaml["num_tokens"] = tokens
 	newCassConfig = &CassandraConfig{}
-	errorWhenNil = (*newCluster).ValidateUpdate(oldCluster)
+	_, errorWhenNil = (*newCluster).ValidateUpdate(oldCluster)
 	required.Error(errorWhenNil, "expected error having new num_token value as nil from previous specified")
 
 	oldCassConfig.CassandraYaml["num_tokens"] = tokens
 	newCassConfig = &CassandraConfig{}
-	errorWhenNil = (*newCluster).ValidateUpdate(oldCluster)
+	_, errorWhenNil = (*newCluster).ValidateUpdate(oldCluster)
 	required.Error(errorWhenNil, "expected error having new num_token value as nil from previous specified")
 
 	// Expected to be able to update without token change, however changes to other config values are made
@@ -330,7 +339,7 @@ func testNumTokens(t *testing.T) {
 	newCluster.Spec.Cassandra.DatacenterOptions.CassandraConfig.CassandraYaml["cdc_enabled"] = enabled
 	newCluster.Spec.Cassandra.DatacenterOptions.CassandraConfig.CassandraYaml["index_summary_resize_interval_in_minutes"] = intervalInMins
 
-	errorOnValidate := (*newCluster).ValidateUpdate(oldCluster)
+	_, errorOnValidate := (*newCluster).ValidateUpdate(oldCluster)
 	required.NoError(errorOnValidate)
 
 	// Expected failure for validation with token change while changes to other config values are being made
@@ -339,7 +348,7 @@ func testNumTokens(t *testing.T) {
 	newCluster.Spec.Cassandra.DatacenterOptions.CassandraConfig.CassandraYaml["cdc_enabled"] = enabled
 	newCluster.Spec.Cassandra.DatacenterOptions.CassandraConfig.CassandraYaml["index_summary_resize_interval_in_minutes"] = intervalInMins
 
-	errorOnValidate = (*newCluster).ValidateUpdate(oldCluster)
+	_, errorOnValidate = (*newCluster).ValidateUpdate(oldCluster)
 	required.Error(errorOnValidate, "expected error when changing the value of num tokens while also changing other field values")
 }
 

apis/medusa/v1alpha1/medusa_webhook_test.go

@@ -13,6 +13,8 @@ import (
 	"github.com/k8ssandra/k8ssandra-operator/pkg/shared"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	//+kubebuilder:scaffold:imports
 
@@ -77,13 +79,20 @@ func TestMedusaWebhooks(t *testing.T) {
 
 	// start webhook server using Manager
 	webhookInstallOptions := &testEnv.WebhookInstallOptions
+
+	whServer := webhook.NewServer(webhook.Options{
+		Port:    webhookInstallOptions.LocalServingPort,
+		Host:    webhookInstallOptions.LocalServingHost,
+		CertDir: webhookInstallOptions.LocalServingCertDir,
+	})
+
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:             scheme,
-		Host:               webhookInstallOptions.LocalServingHost,
-		Port:               webhookInstallOptions.LocalServingPort,
-		CertDir:            webhookInstallOptions.LocalServingCertDir,
-		LeaderElection:     false,
-		MetricsBindAddress: "0",
+		Scheme:         scheme,
+		WebhookServer:  whServer,
+		LeaderElection: false,
+		Metrics: server.Options{
+			BindAddress: "0",
+		},
 	})
 	require.NoError(err)
 

apis/medusa/v1alpha1/medusabackupschedule_webhook.go

@@ -21,6 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 func (r *MedusaBackupSchedule) SetupWebhookWithManager(mgr ctrl.Manager) error {
@@ -34,18 +35,18 @@ func (r *MedusaBackupSchedule) SetupWebhookWithManager(mgr ctrl.Manager) error {
 var _ webhook.Validator = &MedusaBackupSchedule{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *MedusaBackupSchedule) ValidateCreate() error {
-	return r.validateCronSchedule()
+func (r *MedusaBackupSchedule) ValidateCreate() (admission.Warnings, error) {
+	return nil, r.validateCronSchedule()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *MedusaBackupSchedule) ValidateUpdate(old runtime.Object) error {
-	return r.validateCronSchedule()
+func (r *MedusaBackupSchedule) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+	return nil, r.validateCronSchedule()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *MedusaBackupSchedule) ValidateDelete() error {
-	return nil
+func (r *MedusaBackupSchedule) ValidateDelete() (admission.Warnings, error) {
+	return nil, nil
 }
 
 func (r *MedusaBackupSchedule) validateCronSchedule() error {