Rename

Signed-off-by: Ambika Nair <[email protected]>

Author: ambiknai

api/v1alpha1/recoverstalevolume_types.go

@@ -23,9 +23,9 @@ import (
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
-// FixStaleVolumeSpec defines the desired state of FixStaleVolume
+// RestoreStaleVolumeSpec defines the desired state of RestoreStaleVolume
 
-type FixStaleVolumeSpec struct {
+type RestoreStaleVolumeSpec struct {
 	NoOfLogLines int64            `json:"noOfLogLines,omitempty"`
 	Deployment   []DeploymentData `json:"deploymentData,omitempty"`
 }
@@ -35,33 +35,33 @@ type DeploymentData struct {
 	DeploymentNamespace string `json:"deploymentNamespace,omitempty"`
 }
 
-// FixStaleVolumeStatus defines the observed state of FixStaleVolume
-type FixStaleVolumeStatus struct {
+// RestoreStaleVolumeStatus defines the observed state of RestoreStaleVolume
+type RestoreStaleVolumeStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// FixStaleVolume is the Schema for the recoverstalevolumes API
-type FixStaleVolume struct {
+// RestoreStaleVolume is the Schema for the recoverstalevolumes API
+type RestoreStaleVolume struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   FixStaleVolumeSpec   `json:"spec,omitempty"`
-	Status FixStaleVolumeStatus `json:"status,omitempty"`
+	Spec   RestoreStaleVolumeSpec   `json:"spec,omitempty"`
+	Status RestoreStaleVolumeStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 
-// FixStaleVolumeList contains a list of FixStaleVolume
-type FixStaleVolumeList struct {
+// RestoreStaleVolumeList contains a list of RestoreStaleVolume
+type RestoreStaleVolumeList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []FixStaleVolume `json:"items"`
+	Items           []RestoreStaleVolume `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&FixStaleVolume{}, &FixStaleVolumeList{})
+	SchemeBuilder.Register(&RestoreStaleVolume{}, &RestoreStaleVolumeList{})
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -52,7 +52,7 @@ spec:
                 type: integer
             type: object
           status:
-            description: FixStaleVolumeStatus defines the observed state of FixStaleVolume
+            description: RestoreStaleVolumeStatus defines the observed state of RestoreStaleVolume
             type: object
         type: object
     served: true

config/crd/bases/objectdriver.csi.ibm.com_restorestalevolumes.yaml

@@ -126,48 +126,48 @@ rules:
   verbs:
   - update
 - apiGroups:
-  - objectdriver.csi.ibm.com
+  - monitoring.coreos.com
   resources:
-  - restorestalevolumes
+  - servicemonitors
   verbs:
   - create
-  - delete
   - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - objectdriver.csi.ibm.com
   resources:
-  - restorestalevolumes/finalizers
+  - '*'
   verbs:
-  - update
+  - '*'
 - apiGroups:
   - objectdriver.csi.ibm.com
   resources:
-  - restorestalevolumes/status
+  - ibmobjectcsis
   verbs:
+  - create
+  - delete
   - get
+  - list
   - patch
   - update
+  - watch
 - apiGroups:
-  - monitoring.coreos.com
+  - objectdriver.csi.ibm.com
   resources:
-  - servicemonitors
+  - ibmobjectcsis/finalizers
   verbs:
-  - create
-  - get
+  - update
 - apiGroups:
   - objectdriver.csi.ibm.com
   resources:
-  - '*'
+  - ibmobjectcsis/status
   verbs:
-  - '*'
+  - get
+  - patch
+  - update
 - apiGroups:
   - objectdriver.csi.ibm.com
   resources:
-  - ibmobjectcsis
+  - restorestalevolumes
   verbs:
   - create
   - delete
@@ -179,13 +179,13 @@ rules:
 - apiGroups:
   - objectdriver.csi.ibm.com
   resources:
-  - ibmobjectcsis/finalizers
+  - restorestalevolumes/finalizers
   verbs:
   - update
 - apiGroups:
   - objectdriver.csi.ibm.com
   resources:
-  - ibmobjectcsis/status
+  - restorestalevolumes/status
   verbs:
   - get
   - patch

config/rbac/role.yaml

@@ -37,8 +37,8 @@ import (
 	csiv1alpha1 "github.ibm.com/alchemy-containers/ibm-object-csi-driver-operator/api/v1alpha1"
 )
 
-// FixStaleVolumeReconciler reconciles a FixStaleVolume object
-type FixStaleVolumeReconciler struct {
+// RestoreStaleVolumeReconciler reconciles a RestoreStaleVolume object
+type RestoreStaleVolumeReconciler struct {
 	client.Client
 	Scheme *runtime.Scheme
 }
@@ -56,26 +56,26 @@ var transportEndpointError = "transport endpoint is not connected"
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
 // TODO(user): Modify the Reconcile function to compare the state specified by
-// the FixStaleVolume object against the actual cluster state, and then
+// the RestoreStaleVolume object against the actual cluster state, and then
 // perform operations to make the cluster state reflect the state specified by
 // the user.
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
-func (r *FixStaleVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *RestoreStaleVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	reqLogger := staleVolLog.WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name)
-	reqLogger.Info("Reconciling FixStaleVolume")
+	reqLogger.Info("Reconciling RestoreStaleVolume")
 
-	// Fetch FixStaleVolume instance
-	instance := &csiv1alpha1.FixStaleVolume{}
+	// Fetch RestoreStaleVolume instance
+	instance := &csiv1alpha1.RestoreStaleVolume{}
 	err := r.Get(ctx, req.NamespacedName, instance)
 	if err != nil {
 		if k8serr.IsNotFound(err) {
-			reqLogger.Info("FixStaleVolume resource not found. Ignoring since object must be deleted")
+			reqLogger.Info("RestoreStaleVolume resource not found. Ignoring since object must be deleted")
 			return ctrl.Result{}, nil
 		}
 		// Error reading the object.
-		reqLogger.Error(err, "failed to get FixStaleVolume resource")
+		reqLogger.Error(err, "failed to get RestoreStaleVolume resource")
 		return ctrl.Result{}, err
 	}
 
@@ -262,9 +262,9 @@ func (r *FixStaleVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *FixStaleVolumeReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *RestoreStaleVolumeReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&csiv1alpha1.FixStaleVolume{}).
+		For(&csiv1alpha1.RestoreStaleVolume{}).
 		Complete(r)
 }
 

controllers/restorestalevolume_controller.go

@@ -109,11 +109,11 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "IBMObjectCSI")
 		os.Exit(1)
 	}
-	if err = (&controllers.FixStaleVolumeReconciler{
+	if err = (&controllers.RestoreStaleVolumeReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "FixStaleVolume")
+		setupLog.Error(err, "unable to create controller", "controller", "RestoreStaleVolume")
 		os.Exit(1)
 	}
 	//+kubebuilder:scaffold:builder