From 7a6c1d764c8166d6ec3a62961c1ea68867dbdfc2 Mon Sep 17 00:00:00 2001 From: MarkLux Date: Thu, 8 Jun 2023 20:09:20 +0800 Subject: [PATCH] add event info for not upgradble pods when update sidecarset (#1272) Signed-off-by: MarkLux --- .../sidecarset/sidecarset_processor.go | 28 ++++++++++++++++++- .../sidecarset/sidecarset_strategy.go | 21 ++++++++++---- .../sidecarset/sidecarset_strategy_test.go | 4 +-- 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/pkg/controller/sidecarset/sidecarset_processor.go b/pkg/controller/sidecarset/sidecarset_processor.go index 0d50e31553..c873e6d4f0 100644 --- a/pkg/controller/sidecarset/sidecarset_processor.go +++ b/pkg/controller/sidecarset/sidecarset_processor.go @@ -31,6 +31,7 @@ import ( utilclient "github.com/openkruise/kruise/pkg/util/client" historyutil "github.com/openkruise/kruise/pkg/util/history" webhookutil "github.com/openkruise/kruise/pkg/webhook/util" + podutil "k8s.io/kubernetes/pkg/api/v1/pod" apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -48,6 +49,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" ) +const ( + SidecarSetUpgradable corev1.PodConditionType = "SidecarSetUpgradable" +) + type Processor struct { Client client.Client recorder record.EventRecorder @@ -155,7 +160,8 @@ func (p *Processor) UpdateSidecarSet(sidecarSet *appsv1alpha1.SidecarSet) (recon func (p *Processor) updatePods(control sidecarcontrol.SidecarControl, pods []*corev1.Pod) error { sidecarset := control.GetSidecarset() // compute next updated pods based on the sidecarset upgrade strategy - upgradePods := NewStrategy().GetNextUpgradePods(control, pods) + upgradePods, notUpgradablePods := NewStrategy().GetNextUpgradePods(control, pods) + updatePodSidecarSetUpgradableCondition(upgradePods, notUpgradablePods) if len(upgradePods) == 0 { klog.V(3).Infof("sidecarSet next update is nil, skip this round, name: %s", sidecarset.Name) return nil @@ -602,3 +608,23 @@ func inconsistentStatus(sidecarSet *appsv1alpha1.SidecarSet, status *appsv1alpha func isSidecarSetUpdateFinish(status *appsv1alpha1.SidecarSetStatus) bool { return status.UpdatedPods >= status.MatchedPods } + +func updatePodSidecarSetUpgradableCondition(upgradePods []*corev1.Pod, notUpgradablePods []*corev1.Pod) { + for _, pod := range upgradePods { + podutil.UpdatePodCondition(&pod.Status, &corev1.PodCondition{ + Type: SidecarSetUpgradable, + Status: corev1.ConditionTrue, + }) + klog.V(3).Infof("pod %s/%s sidecar set is upgradable, condition updated", pod.Namespace, pod.Name) + } + + for _, pod := range upgradePods { + podutil.UpdatePodCondition(&pod.Status, &corev1.PodCondition{ + Type: SidecarSetUpgradable, + Status: corev1.ConditionFalse, + Reason: "UpdateImmutableField", + Message: "Pod's sidecar set is not upgradable due to change out of image field", + }) + klog.V(3).Infof("pod %s/%s sidecar set is not upgradable, condition updated", pod.Namespace, pod.Name) + } +} diff --git a/pkg/controller/sidecarset/sidecarset_strategy.go b/pkg/controller/sidecarset/sidecarset_strategy.go index edb14d0295..81ae25d590 100644 --- a/pkg/controller/sidecarset/sidecarset_strategy.go +++ b/pkg/controller/sidecarset/sidecarset_strategy.go @@ -22,7 +22,8 @@ type Strategy interface { //2. Sort Pods with default sequence //3. sort waitUpdateIndexes based on the scatter rules //4. calculate max count of pods can update with maxUnavailable - GetNextUpgradePods(control sidecarcontrol.SidecarControl, pods []*corev1.Pod) []*corev1.Pod + //5. also return the pods that are not upgradable + GetNextUpgradePods(control sidecarcontrol.SidecarControl, pods []*corev1.Pod) (upgradePods []*corev1.Pod, notUpgradablePods []*corev1.Pod) } type spreadingStrategy struct{} @@ -35,10 +36,12 @@ func NewStrategy() Strategy { return globalSpreadingStrategy } -func (p *spreadingStrategy) GetNextUpgradePods(control sidecarcontrol.SidecarControl, pods []*corev1.Pod) (upgradePods []*corev1.Pod) { +func (p *spreadingStrategy) GetNextUpgradePods(control sidecarcontrol.SidecarControl, pods []*corev1.Pod) (upgradePods []*corev1.Pod, notUpgradablePods []*corev1.Pod) { sidecarset := control.GetSidecarset() // wait to upgrade pod index var waitUpgradedIndexes []int + // the pod that are not upgradable, will be skipped + var notUpgradableIndexes []int strategy := sidecarset.Spec.UpdateStrategy // If selector is not nil, check whether the pods is selected to upgrade @@ -68,12 +71,16 @@ func (p *spreadingStrategy) GetNextUpgradePods(control sidecarcontrol.SidecarCon // * It is to determine whether there are other fields that have been modified for pod. for index, pod := range pods { isUpdated := sidecarcontrol.IsPodSidecarUpdated(sidecarset, pod) - if !isUpdated && isSelected(pod) && control.IsSidecarSetUpgradable(pod) { - waitUpgradedIndexes = append(waitUpgradedIndexes, index) + if !isUpdated && isSelected(pod) { + if control.IsSidecarSetUpgradable(pod) { + waitUpgradedIndexes = append(waitUpgradedIndexes, index) + } else { + notUpgradableIndexes = append(notUpgradableIndexes, index) + } } } - klog.V(3).Infof("sidecarSet(%s) matchedPods(%d) waitUpdated(%d)", sidecarset.Name, len(pods), len(waitUpgradedIndexes)) + klog.V(3).Infof("sidecarSet(%s) matchedPods(%d) waitUpdated(%d) notUpgradable(%d)", sidecarset.Name, len(pods), len(waitUpgradedIndexes), len(notUpgradableIndexes)) //2. sort Pods with default sequence and scatter waitUpgradedIndexes = SortUpdateIndexes(strategy, pods, waitUpgradedIndexes) @@ -87,6 +94,10 @@ func (p *spreadingStrategy) GetNextUpgradePods(control sidecarcontrol.SidecarCon for _, idx := range waitUpgradedIndexes { upgradePods = append(upgradePods, pods[idx]) } + // 5. pods that are not upgradable will not be skipped in the following process + for _, idx := range notUpgradableIndexes { + notUpgradablePods = append(notUpgradablePods, pods[idx]) + } return } diff --git a/pkg/controller/sidecarset/sidecarset_strategy_test.go b/pkg/controller/sidecarset/sidecarset_strategy_test.go index 48a0c9ee42..223c5a2308 100644 --- a/pkg/controller/sidecarset/sidecarset_strategy_test.go +++ b/pkg/controller/sidecarset/sidecarset_strategy_test.go @@ -324,7 +324,7 @@ func testGetNextUpgradePods(t *testing.T, factoryPods FactoryPods, factorySideca t.Run(cs.name, func(t *testing.T) { control := sidecarcontrol.New(cs.getSidecarset()) pods := cs.getPods() - upgradePods := strategy.GetNextUpgradePods(control, pods) + upgradePods, _ := strategy.GetNextUpgradePods(control, pods) if cs.exceptNeedUpgradeCount != len(upgradePods) { t.Fatalf("except NeedUpgradeCount(%d), but get value(%d)", cs.exceptNeedUpgradeCount, len(upgradePods)) } @@ -524,7 +524,7 @@ func testSortNextUpgradePods(t *testing.T, factoryPods FactoryPods, factorySidec t.Run(cs.name, func(t *testing.T) { control := sidecarcontrol.New(cs.getSidecarset()) pods := cs.getPods() - injectedPods := strategy.GetNextUpgradePods(control, pods) + injectedPods, _ := strategy.GetNextUpgradePods(control, pods) if len(cs.exceptNextUpgradePods) != len(injectedPods) { t.Fatalf("except NeedUpgradeCount(%d), but get value(%d)", len(cs.exceptNextUpgradePods), len(injectedPods)) }