From 699848f75fea9c3164233de2fdbf9d77d6faa286 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 14 Nov 2023 13:26:58 +0100 Subject: [PATCH 1/2] ci: update group rules for dependabot update group rules for dependabot for tools folder. Signed-off-by: Madhu Rajanna --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 04d0782b2..85b9fc1fa 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -40,6 +40,7 @@ updates: patterns: - "github.com/golang*" - "google.golang.org/*" + - "golang.org/x/*" k8s-dependencies: patterns: - "k8s.io*" From 209424ee698060751615a72caecdc8ee246500d4 Mon Sep 17 00:00:00 2001 From: rakeshgm Date: Tue, 31 Oct 2023 23:35:16 +0530 Subject: [PATCH 2/2] update to proper message on a successful fence op Signed-off-by: rakeshgm --- apis/csiaddons/v1alpha1/networkfence_types.go | 8 ++++++++ controllers/csiaddons/networkfence_controller.go | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apis/csiaddons/v1alpha1/networkfence_types.go b/apis/csiaddons/v1alpha1/networkfence_types.go index 7f0373901..71b891c3c 100644 --- 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 index c52b53aed..d859e7567 100644 --- 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