Merge branch 'main' into bha-cpumemlimits

Author: Bhagyashreek8

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-06-03T09:31:24Z",
+  "generated_at": "2024-06-12T11:19:05Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

api/v1alpha1/recoverstalevolume_types.go

@@ -26,14 +26,14 @@ import (
 
 // RecoverStaleVolumeSpec defines the desired state of RecoverStaleVolume
 type RecoverStaleVolumeSpec struct {
-	NoOfLogLines int64            `json:"noOfLogLines,omitempty"`
-	Deployment   []DeploymentData `json:"deploymentData,omitempty"`
+	LogHistory int64                      `json:"logHistory,omitempty"`
+	Data       []NamespacedDeploymentData `json:"data"`
 }
 
-// DeploymentData ...
-type DeploymentData struct {
-	DeploymentName      string `json:"deploymentName,omitempty"`
-	DeploymentNamespace string `json:"deploymentNamespace,omitempty"`
+// NamespacedDeploymentData ...
+type NamespacedDeploymentData struct {
+	Namespace   string   `json:"namespace"`
+	Deployments []string `json:"deployments,omitempty"`
 }
 
 // RecoverStaleVolumeStatus defines the observed state of RecoverStaleVolume

api/v1alpha1/zz_generated.deepcopy.go

@@ -40,19 +40,25 @@ spec:
           spec:
             description: RecoverStaleVolumeSpec defines the desired state of RecoverStaleVolume
             properties:
-              deploymentData:
+              data:
                 items:
-                  description: DeploymentData ...
+                  description: NamespacedDeploymentData ...
                   properties:
-                    deploymentName:
-                      type: string
-                    deploymentNamespace:
+                    deployments:
+                      items:
+                        type: string
+                      type: array
+                    namespace:
                       type: string
+                  required:
+                  - namespace
                   type: object
                 type: array
-              noOfLogLines:
+              logHistory:
                 format: int64
                 type: integer
+            required:
+            - data
             type: object
           status:
             description: RecoverStaleVolumeStatus defines the observed state of RecoverStaleVolume

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

@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: ibm-object-csi-operator-system
+namespace: ibm-object-csi-operator
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named

config/default/kustomization.yaml

@@ -2,7 +2,7 @@ apiVersion: objectdriver.csi.ibm.com/v1alpha1
 kind: IBMObjectCSI
 metadata:
   name: ibm-object-csi
-  namespace: ibm-object-csi-operator-system
+  namespace: ibm-object-csi-operator
   labels:
     app.kubernetes.io/name: ibm-object-csi
     app.kubernetes.io/instance: ibm-object-csi

config/samples/csi_v1alpha1_ibmobjectcsi.yaml

@@ -5,9 +5,9 @@ metadata:
     app.kubernetes.io/name: recoverstalevolume
     app.kubernetes.io/instance: recoverstalevolume-sample
   name: recoverstalevolume-sample
-  namespace: ibm-object-csi-operator-system
+  namespace: ibm-object-csi-operator
 spec:
-  noOfLogLines: 200
-  deploymentData:
-    - deploymentName: cos-csi-app-deployment
-      deploymentNamespace: default
+  logHistory: 200
+  data:
+    - namespace: default
+      deployments: []

config/samples/csi_v1alpha1_recoverstalevolume.yaml

@@ -1,15 +1,19 @@
 // Package constants ...
 package constants
 
-import "fmt"
+import (
+	"fmt"
+	"time"
+)
 
 const (
 	APIGroup = "objectdriver.csi.ibm.com"
 
-	APIVersion      = "v1"
-	CSIOperatorName = "ibm-object-csi-driver-operator"
-	CSIDriverName   = "ibm-object-csi-driver"
-	DriverName      = "cos.s3.csi.ibm.io"
+	APIVersion           = "v1"
+	CSIOperatorName      = "ibm-object-csi-driver-operator"
+	CSIOperatorNamespace = "ibm-object-csi-operator"
+	CSIDriverName        = "ibm-object-csi-driver"
+	DriverName           = "cos.s3.csi.ibm.io"
 
 	RbacAuthorizationAPIGroup = "rbac.authorization.k8s.io"
 	SecurityOpenshiftAPIGroup = "security.openshift.io"
@@ -73,10 +77,18 @@ const (
 	ObjectCSIDriverOperatorDeployNS = "ibm-object-csi-operator-system"
 	ObjectCSIDriver                 = "ibm-object-csi"
 
-	RcloneRetainStorageClass = "ibm-object-storage-rclone-retain-sc"
-	RcloneStorageClass       = "ibm-object-storage-rclone-sc"
-	S3fsRetainStorageClass   = "ibm-object-storage-s3fs-retain-sc"
-	S3fsStorageClass         = "ibm-object-storage-s3fs-sc"
+	StorageClassPrefix = "ibm-object-storage-"
+	StorageClassSuffix = "-sc"
+
+	RcloneRetainStorageClass = StorageClassPrefix + "rclone-retain" + StorageClassSuffix
+	RcloneStorageClass       = StorageClassPrefix + "rclone" + StorageClassSuffix
+	S3fsRetainStorageClass   = StorageClassPrefix + "s3fs-retain" + StorageClassSuffix
+	S3fsStorageClass         = StorageClassPrefix + "s3fs" + StorageClassSuffix
+
+	DefaultLogTailLines    = 300
+	DefaultNamespace       = "default"
+	ReconcilationTime      = 5 * time.Minute
+	TransportEndpointError = "transport endpoint is not connected"
 )
 
 var CommonCSIResourceLabels = map[string]string{

controllers/constants/constants.go

@@ -0,0 +1,50 @@
+package crutils
+
+import (
+	"context"
+
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+type K8sResourceOps struct {
+	client.Client
+	Ctx       context.Context
+	Namespace string
+}
+
+func (op *K8sResourceOps) GetDeployment(name string) (*appsv1.Deployment, error) {
+	deployment := &appsv1.Deployment{}
+	err := op.Get(op.Ctx, types.NamespacedName{Name: name, Namespace: op.Namespace}, deployment)
+	return deployment, err
+}
+
+func (op *K8sResourceOps) ListDeployment() (*appsv1.DeploymentList, error) {
+	var listOptions = &client.ListOptions{Namespace: op.Namespace}
+	deploymentList := &appsv1.DeploymentList{}
+	err := op.List(op.Ctx, deploymentList, listOptions)
+	return deploymentList, err
+}
+
+func (op *K8sResourceOps) DeletePod(pod *corev1.Pod) error {
+	var zero int64
+	var deleteOptions = &client.DeleteOptions{GracePeriodSeconds: &zero}
+	err := op.Delete(op.Ctx, pod, deleteOptions)
+	return err
+}
+
+func (op *K8sResourceOps) ListPod() (*corev1.PodList, error) {
+	var listOptions = &client.ListOptions{Namespace: op.Namespace}
+	podList := &corev1.PodList{}
+	err := op.List(op.Ctx, podList, listOptions)
+	return podList, err
+}
+
+func (op *K8sResourceOps) ListPVC() (*corev1.PersistentVolumeClaimList, error) {
+	var listOptions = &client.ListOptions{Namespace: op.Namespace}
+	pvcList := &corev1.PersistentVolumeClaimList{}
+	err := op.List(op.Ctx, pvcList, listOptions)
+	return pvcList, err
+}

controllers/internal/crutils/k8s-resource-ops.go

@@ -53,13 +53,15 @@ func parseLogs(nodePodLogs string) map[string]string {
 			if len(matches) == 2 {
 				mapContent := matches[1]
 
-				getVolumeID := regexp.MustCompile("VolumeId:\\S+").FindStringSubmatch(mapContent) //nolint:gosimple
-				volumeID := strings.Split(getVolumeID[0], ":")[1]
+				getVolumeID := regexp.MustCompile(`VolumeId:\S+`).FindStringSubmatch(mapContent)
+				if len(getVolumeID) != 0 {
+					volumeID := strings.Split(getVolumeID[0], ":")[1]
 
-				getErrMsg := strings.ReplaceAll(mapContent, getVolumeID[0], "")
-				errMsg := strings.Split(getErrMsg, ":")[1]
+					getErrMsg := strings.ReplaceAll(mapContent, getVolumeID[0], "")
+					errMsg := strings.Split(getErrMsg, ":")[1]
 
-				volumesStats[volumeID] = errMsg
+					volumesStats[volumeID] = errMsg
+				}
 			}
 		}
 	}