Merge pull request #103 from red-hat-storage/sync_us--main

Syncing latest changes from upstream main for kubernetes-csi-addons
red-hat-storage · Nov 18, 2023 · 7774294 · 7774294
2 parents 8bcee0e + 209424e
commit 7774294
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -44,6 +44,7 @@ updates:
         patterns:
           - "github.com/golang*"
           - "google.golang.org/*"
+          - "golang.org/x/*"
       k8s-dependencies:
         patterns:
           - "k8s.io*"

diff --git a/apis/csiaddons/v1alpha1/networkfence_types.go b/apis/csiaddons/v1alpha1/networkfence_types.go
@@ -40,6 +40,14 @@ const (
 	FencingOperationResultFailed FencingOperationResult = "Failed"
 )
 
+const (
+	// FenceOperationSuccessfulMessage represents successful message on fence operation
+	FenceOperationSuccessfulMessage = "fencing operation successful"
+
+	// UnFenceOperationSuccessfulMessage represents successful message on unfence operation
+	UnFenceOperationSuccessfulMessage = "unfencing operation successful"
+)
+
 // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="secret is immutable"
 // SecretSpec defines the secrets to be used for the network fencing operation.
 type SecretSpec struct {

diff --git a/controllers/csiaddons/networkfence_controller.go b/controllers/csiaddons/networkfence_controller.go
@@ -154,7 +154,15 @@ func (r *NetworkFenceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return ctrl.Result{}, err
 	}
 
-	err = nf.updateStatus(ctx, csiaddonsv1alpha1.FencingOperationResultSucceeded, "fencing operation successful")
+	var successMsg string
+	switch nf.instance.Spec.FenceState {
+	case csiaddonsv1alpha1.Fenced:
+		successMsg = csiaddonsv1alpha1.FenceOperationSuccessfulMessage
+	case csiaddonsv1alpha1.Unfenced:
+		successMsg = csiaddonsv1alpha1.UnFenceOperationSuccessfulMessage
+	}
+
+	err = nf.updateStatus(ctx, csiaddonsv1alpha1.FencingOperationResultSucceeded, successMsg)
 	if err != nil {
 		logger.Error(err, "failed to update status")
 		return ctrl.Result{}, err