controllers: Update code to match updated dependencies APIs

Signed-off-by: Leela Venkaiah G <[email protected]>
red-hat-storage · Oct 5, 2023 · 691410f · 691410f
1 parent 2a05d8d
commit 691410f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 32 deletions.
diff --git a/controllers/clusterversion_controller.go b/controllers/clusterversion_controller.go
@@ -45,7 +45,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 //go:embed pvc-rules.yaml
@@ -93,7 +92,7 @@ func (c *ClusterVersionReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	)
 	// Reconcile the ClusterVersion object when the operator config map is updated
 	enqueueClusterVersionRequest := handler.EnqueueRequestsFromMapFunc(
-		func(client client.Object) []reconcile.Request {
+		func(_ context.Context, client client.Object) []reconcile.Request {
 			return []reconcile.Request{{
 				NamespacedName: types.NamespacedName{
 					Name: clusterVersionName,
@@ -104,7 +103,7 @@ func (c *ClusterVersionReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&configv1.ClusterVersion{}, clusterVersionPredicates).
-		Watches(&source.Kind{Type: &corev1.ConfigMap{}}, enqueueClusterVersionRequest, configMapPredicates).
+		Watches(&corev1.ConfigMap{}, enqueueClusterVersionRequest, configMapPredicates).
 		Complete(c)
 }
 

diff --git a/controllers/storageclassclaim_controller.go b/controllers/storageclassclaim_controller.go
@@ -45,7 +45,6 @@ import (
 	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 const (
@@ -69,7 +68,7 @@ type StorageClassClaimReconciler struct {
 // SetupWithManager sets up the controller with the Manager.
 func (r *StorageClassClaimReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	enqueueStorageConsumerRequest := handler.EnqueueRequestsFromMapFunc(
-		func(obj client.Object) []reconcile.Request {
+		func(_ context.Context, obj client.Object) []reconcile.Request {
 			annotations := obj.GetAnnotations()
 			if _, found := annotations[storageClassClaimAnnotation]; found {
 				return []reconcile.Request{{
@@ -84,8 +83,8 @@ func (r *StorageClassClaimReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&v1alpha1.StorageClassClaim{}, builder.WithPredicates(
 			predicate.GenerationChangedPredicate{},
 		)).
-		Watches(&source.Kind{Type: &storagev1.StorageClass{}}, enqueueStorageConsumerRequest).
-		Watches(&source.Kind{Type: &snapapi.VolumeSnapshotClass{}}, enqueueStorageConsumerRequest).
+		Watches(&storagev1.StorageClass{}, enqueueStorageConsumerRequest).
+		Watches(&snapapi.VolumeSnapshotClass{}, enqueueStorageConsumerRequest).
 		Complete(r)
 }
 

diff --git a/controllers/storageclient_controller.go b/controllers/storageclient_controller.go
@@ -46,7 +46,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 const (
@@ -88,7 +87,7 @@ func (s *StorageClientReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		return res
 	})
 	enqueueStorageClientRequest := handler.EnqueueRequestsFromMapFunc(
-		func(obj client.Object) []reconcile.Request {
+		func(_ context.Context, obj client.Object) []reconcile.Request {
 			annotations := obj.GetAnnotations()
 			if _, found := annotations[storageClassClaimAnnotation]; found {
 				return []reconcile.Request{{
@@ -102,7 +101,7 @@ func (s *StorageClientReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	s.recorder = utils.NewEventReporter(mgr.GetEventRecorderFor("controller_storageclient"))
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&v1alpha1.StorageClient{}).
-		Watches(&source.Kind{Type: &v1alpha1.StorageClassClaim{}}, enqueueStorageClientRequest).
+		Watches(&v1alpha1.StorageClassClaim{}, enqueueStorageClientRequest).
 		Complete(s)
 }
 

diff --git a/pkg/csi/cephfsdaemonset.go b/pkg/csi/cephfsdaemonset.go
@@ -24,7 +24,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 const (
@@ -77,8 +77,8 @@ func GetCephFSDaemonSet(namespace string) *appsv1.DaemonSet {
 							Image:           sidecarImages.ContainerImages.CephCSIImageURL,
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							SecurityContext: &corev1.SecurityContext{
-								Privileged:               pointer.Bool(true),
-								AllowPrivilegeEscalation: pointer.Bool(true),
+								Privileged:               ptr.To(true),
+								AllowPrivilegeEscalation: ptr.To(true),
 								Capabilities: &corev1.Capabilities{
 									Add: []corev1.Capability{
 										"SYS_ADMIN",

diff --git a/pkg/csi/cephfsdeployment.go b/pkg/csi/cephfsdeployment.go
@@ -24,7 +24,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 const (
@@ -68,7 +68,7 @@ func GetCephFSDeployment(namespace string) *appsv1.Deployment {
 			Labels:    cephfsDeploymentLabels,
 		},
 		Spec: appsv1.DeploymentSpec{
-			Replicas: pointer.Int32(2),
+			Replicas: ptr.To(int32(2)),
 			Selector: &metav1.LabelSelector{
 				MatchLabels: cephfsDeploymentLabels,
 			},

diff --git a/pkg/csi/rbddaemonset.go b/pkg/csi/rbddaemonset.go
@@ -40,7 +40,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 var (
@@ -90,8 +90,8 @@ func GetRBDDaemonSet(namespace string) *appsv1.DaemonSet {
 							Image:           sidecarImages.ContainerImages.CephCSIImageURL,
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							SecurityContext: &corev1.SecurityContext{
-								Privileged:               pointer.Bool(true),
-								AllowPrivilegeEscalation: pointer.Bool(true),
+								Privileged:               ptr.To(true),
+								AllowPrivilegeEscalation: ptr.To(true),
 								Capabilities: &corev1.Capabilities{
 									Add: []corev1.Capability{
 										"SYS_ADMIN",
@@ -201,8 +201,8 @@ func GetRBDDaemonSet(namespace string) *appsv1.DaemonSet {
 							Image:           sidecarImages.ContainerImages.CSIADDONSImageURL,
 							ImagePullPolicy: corev1.PullIfNotPresent,
 							SecurityContext: &corev1.SecurityContext{
-								Privileged:               pointer.Bool(true),
-								AllowPrivilegeEscalation: pointer.Bool(true),
+								Privileged:               ptr.To(true),
+								AllowPrivilegeEscalation: ptr.To(true),
 							},
 							Args: []string{
 								"--node-id=$(NODE_ID)",
@@ -381,7 +381,7 @@ func GetRBDDaemonSet(namespace string) *appsv1.DaemonSet {
 										{
 											ServiceAccountToken: &corev1.ServiceAccountTokenProjection{
 												Path:              "oidc-token",
-												ExpirationSeconds: pointer.Int64(3600),
+												ExpirationSeconds: ptr.To(int64(3600)),
 												Audience:          "ceph-csi-kms",
 											},
 										},

diff --git a/pkg/csi/rbddeployment.go b/pkg/csi/rbddeployment.go
@@ -24,7 +24,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 var rbdDeploymentLabels = map[string]string{
@@ -67,7 +67,7 @@ func GetRBDDeployment(namespace string) *appsv1.Deployment {
 			Labels:    rbdDeploymentLabels,
 		},
 		Spec: appsv1.DeploymentSpec{
-			Replicas: pointer.Int32(2),
+			Replicas: ptr.To(int32(2)),
 			Selector: &metav1.LabelSelector{
 				MatchLabels: rbdDeploymentLabels,
 			},
@@ -238,7 +238,7 @@ func GetRBDDeployment(namespace string) *appsv1.Deployment {
 										{
 											ServiceAccountToken: &corev1.ServiceAccountTokenProjection{
 												Path:              "oidc-token",
-												ExpirationSeconds: pointer.Int64(3600),
+												ExpirationSeconds: ptr.To(int64(3600)),
 												Audience:          "ceph-csi-kms",
 											},
 										},

diff --git a/pkg/templates/csidriver.go b/pkg/templates/csidriver.go
@@ -18,7 +18,7 @@ package templates
 
 import (
 	v1k8scsi "k8s.io/api/storage/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 var (
@@ -27,16 +27,16 @@ var (
 
 var CephFSCSIDriver = &v1k8scsi.CSIDriver{
 	Spec: v1k8scsi.CSIDriverSpec{
-		AttachRequired: pointer.Bool(true),
-		PodInfoOnMount: pointer.Bool(false),
+		AttachRequired: ptr.To(true),
+		PodInfoOnMount: ptr.To(false),
 		FSGroupPolicy:  &fileFSGroupPolicy,
 	},
 }
 
 var RbdCSIDriver = &v1k8scsi.CSIDriver{
 	Spec: v1k8scsi.CSIDriverSpec{
-		AttachRequired: pointer.Bool(true),
-		PodInfoOnMount: pointer.Bool(false),
+		AttachRequired: ptr.To(true),
+		PodInfoOnMount: ptr.To(false),
 		FSGroupPolicy:  &fileFSGroupPolicy,
 	},
 }
diff --git a/pkg/templates/csisidecars.go b/pkg/templates/csisidecars.go
@@ -21,7 +21,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 var ProvisionerContainer = &corev1.Container{
@@ -147,8 +147,8 @@ var DriverRegistrar = &corev1.Container{
 	Name:            "csi-driver-registrar",
 	ImagePullPolicy: corev1.PullIfNotPresent,
 	SecurityContext: &corev1.SecurityContext{
-		Privileged:               pointer.Bool(true),
-		AllowPrivilegeEscalation: pointer.Bool(true),
+		Privileged:               ptr.To(true),
+		AllowPrivilegeEscalation: ptr.To(true),
 	},
 	Args: []string{
 		fmt.Sprintf("--csi-address=%s", DefaultPluginSocketPath),