From 30acbf5fe282c041ad8f3313458fb41ef4a34985 Mon Sep 17 00:00:00 2001 From: Kuromesi Date: Wed, 5 Jul 2023 11:12:01 +0800 Subject: [PATCH] disabled rollout Signed-off-by: Kuromesi --- pkg/controller/rollout/rollout_canary.go | 5 ----- pkg/controller/rollout/rollout_status.go | 4 +--- pkg/webhook/workload/mutating/workload_update_handler.go | 6 +++++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/controller/rollout/rollout_canary.go b/pkg/controller/rollout/rollout_canary.go index 990d3ef0..4ae89517 100755 --- a/pkg/controller/rollout/rollout_canary.go +++ b/pkg/controller/rollout/rollout_canary.go @@ -454,11 +454,6 @@ func (m *canaryReleaseManager) finalizingBatchRelease(c *RolloutContext) (bool, return false, err } klog.Infof("rollout(%s/%s) patch batchRelease(%s) success", c.Rollout.Namespace, c.Rollout.Name, body) - - // if rollout is disabling, then the batchrelease should be deleted - if c.NewStatus.Phase == v1alpha1.RolloutPhaseDisabling { - return true, nil - } return false, nil } diff --git a/pkg/controller/rollout/rollout_status.go b/pkg/controller/rollout/rollout_status.go index d6702125..15edbba8 100755 --- a/pkg/controller/rollout/rollout_status.go +++ b/pkg/controller/rollout/rollout_status.go @@ -57,7 +57,6 @@ func (r *RolloutReconciler) calculateRolloutStatus(rollout *v1alpha1.Rollout) (r newStatus.Message = "Disabling rollout, release resources" } else { newStatus.Phase = v1alpha1.RolloutPhaseDisabled - newStatus.ObservedGeneration = rollout.Generation newStatus.Message = "Rollout is disabled" } } @@ -77,8 +76,8 @@ func (r *RolloutReconciler) calculateRolloutStatus(rollout *v1alpha1.Rollout) (r Phase: v1alpha1.RolloutPhaseInitial, Message: "Workload Not Found", } + klog.Infof("rollout(%s/%s) workload not found, and reset status be Initial", rollout.Namespace, rollout.Name) } - klog.Infof("rollout(%s/%s) workload not found, and reset status be Initial", rollout.Namespace, rollout.Name) return false, newStatus, nil } klog.V(5).Infof("rollout(%s/%s) workload(%s)", rollout.Namespace, rollout.Name, util.DumpJSON(workload)) @@ -240,7 +239,6 @@ func (r *RolloutReconciler) reconcileRolloutDisabling(rollout *v1alpha1.Rollout, } else if done { klog.Infof("rollout(%s/%s) is disabled", rollout.Namespace, rollout.Name) newStatus.Phase = v1alpha1.RolloutPhaseDisabled - newStatus.ObservedGeneration = rollout.Generation newStatus.Message = "Rollout is disabled" } else { // Incomplete, recheck diff --git a/pkg/webhook/workload/mutating/workload_update_handler.go b/pkg/webhook/workload/mutating/workload_update_handler.go index 1fb46087..4e7536c6 100644 --- a/pkg/webhook/workload/mutating/workload_update_handler.go +++ b/pkg/webhook/workload/mutating/workload_update_handler.go @@ -406,7 +406,11 @@ func (h *WorkloadHandler) fetchMatchedRollout(obj client.Object) (*appsv1alpha1. } for i := range rolloutList.Items { rollout := &rolloutList.Items[i] - if !rollout.DeletionTimestamp.IsZero() || rollout.Spec.ObjectRef.WorkloadRef == nil || rollout.Status.Phase == appsv1alpha1.RolloutPhaseDisabled { + if !rollout.DeletionTimestamp.IsZero() || rollout.Spec.ObjectRef.WorkloadRef == nil { + continue + } + if rollout.Status.Phase == appsv1alpha1.RolloutPhaseDisabled { + klog.Infof("Disabled rollout(%s/%s) fetched when fetching matched rollout", rollout.Namespace, rollout.Name) continue } ref := rollout.Spec.ObjectRef.WorkloadRef