Fix breaking changes

Signed-off-by: Malay Kumar Parida <[email protected]>
red-hat-storage · Oct 19, 2023 · 1b700a2 · 1b700a2
1 parent ae2b063
commit 1b700a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/controllers/storagecluster/cephcluster.go b/controllers/storagecluster/cephcluster.go
@@ -549,7 +549,7 @@ func isMultus(nwSpec *rookCephv1.NetworkSpec) bool {
 	return false
 }
 
-func validateMultusSelectors(selectors map[string]string) error {
+func validateMultusSelectors(selectors map[rookCephv1.CephNetworkType]string) error {
 	publicNetwork, validPublicNetworkKey := selectors[publicNetworkSelectorKey]
 	clusterNetwork, validClusterNetworkKey := selectors[clusterNetworkSelectorKey]
 	if !validPublicNetworkKey && !validClusterNetworkKey {

diff --git a/controllers/storagecluster/storagecluster_controller_test.go b/controllers/storagecluster/storagecluster_controller_test.go
@@ -1109,7 +1109,7 @@ func TestStorageClusterOnMultus(t *testing.T) {
 		if c.testCase != "default" {
 			c.cr.Spec.Network = &rookCephv1.NetworkSpec{
 				Provider: networkProvider,
-				Selectors: map[string]string{
+				Selectors: map[rookCephv1.CephNetworkType]string{
 					"public":  c.publicNW,
 					"cluster": c.clusterNW,
 				},

diff --git a/main.go b/main.go
@@ -61,6 +61,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	apiclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metrics "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -129,14 +130,12 @@ func main() {
 	cfg := ctrl.GetConfigOrDie()
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
 		Scheme:                  scheme,
-		MetricsBindAddress:      metricsAddr,
+		Metrics:                 metrics.Options{BindAddress: metricsAddr},
 		HealthProbeBindAddress:  probeAddr,
-		Port:                    9443,
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionID:        "ab76f4c9.openshift.io",
 		LeaderElectionNamespace: operatorNamespace,
-		Namespace:               operatorNamespace,
-		Cache:                   cache.Options{Namespaces: []string{operatorNamespace}},
+		Cache:                   cache.Options{DefaultNamespaces: map[string]cache.Config{operatorNamespace: {}}},
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")