diff --git a/controller/utils/slow_start.go b/controller/utils/slow_start.go index 5d8697dc..1668e1c7 100644 --- a/controller/utils/slow_start.go +++ b/controller/utils/slow_start.go @@ -1,5 +1,4 @@ /* -Copyright 2016 The Kubernetes Authors. Copyright 2024-2025 The KusionStack Authors. Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/xset/opslifecycle/label_manager.go b/xset/opslifecycle/label_manager.go index f3f4ef47..0de7e3dc 100644 --- a/xset/opslifecycle/label_manager.go +++ b/xset/opslifecycle/label_manager.go @@ -17,20 +17,22 @@ package opslifecycle import ( + appsv1alpha1 "kusionstack.io/kube-api/apps/v1alpha1" + "kusionstack.io/kube-utils/xset/api" ) // OpsLifecycle default labels var ( - defaultOperatingLabelPrefix = "operating.opslifecycle.kusionstack.io" - defaultOperationTypeLabelPrefix = "operation-type.opslifecycle.kusionstack.io" - defaultOperateLabelPrefix = "operate.opslifecycle.kusionstack.io" - defaultUndoOperationTypeLabelPrefix = "undo-operation-type.opslifecycle.kusionstack.io" - defaultServiceAvailableLabel = "opslifecycle.kusionstack.io/service-available" - defaultPreparingDeleteLabel = "opslifecycle.kusionstack.io/preparing-to-delete" + defaultOperatingLabelPrefix = appsv1alpha1.PodOperatingLabelPrefix + defaultOperationTypeLabelPrefix = appsv1alpha1.PodOperationTypeLabelPrefix + defaultOperateLabelPrefix = appsv1alpha1.PodOperateLabelPrefix + defaultUndoOperationTypeLabelPrefix = appsv1alpha1.PodUndoOperationTypeLabelPrefix + defaultServiceAvailableLabel = appsv1alpha1.PodServiceAvailableLabel + defaultPreparingDeleteLabel = appsv1alpha1.PodPreparingDeleteLabel ) -var defaultLables = map[api.OperationLabelEnum]string{ +var defaultLabels = map[api.OperationLabelEnum]string{ api.OperatingLabelPrefix: defaultOperatingLabelPrefix, api.OperationTypeLabelPrefix: defaultOperationTypeLabelPrefix, api.OperateLabelPrefix: defaultOperateLabelPrefix, @@ -46,7 +48,7 @@ type LabelManagerImpl struct { func NewLabelManager(overwrite map[api.OperationLabelEnum]string) api.LifeCycleLabelManager { labelKeys := make(map[api.OperationLabelEnum]string) - for k, v := range defaultLables { + for k, v := range defaultLabels { labelKeys[k] = v } if len(overwrite) > 0 { @@ -55,7 +57,7 @@ func NewLabelManager(overwrite map[api.OperationLabelEnum]string) api.LifeCycleL } } - wellKnownLabelPrefilxesWithID := []string{ + wellKnownLabelPrefixesWithID := []string{ labelKeys[api.OperatingLabelPrefix], labelKeys[api.OperationTypeLabelPrefix], labelKeys[api.UndoOperationTypeLabelPrefix], @@ -63,7 +65,7 @@ func NewLabelManager(overwrite map[api.OperationLabelEnum]string) api.LifeCycleL } return &LabelManagerImpl{ labels: labelKeys, - wellKnownLabelPrefixesWithID: wellKnownLabelPrefilxesWithID, + wellKnownLabelPrefixesWithID: wellKnownLabelPrefixesWithID, } } diff --git a/xset/synccontrols/sync_control.go b/xset/synccontrols/sync_control.go index 492a04a9..95ca01d1 100644 --- a/xset/synccontrols/sync_control.go +++ b/xset/synccontrols/sync_control.go @@ -65,9 +65,9 @@ func NewRealSyncControl(reconcileMixIn *mixin.ReconcilerMixin, if lifeCycleLabelManager == nil { lifeCycleLabelManager = opslifecycle.NewLabelManager(nil) } - scaleInOpsLicecycleAdapter := xsetController.GetScaleInOpsLifecycleAdapter() - if scaleInOpsLicecycleAdapter == nil { - scaleInOpsLicecycleAdapter = &opslifecycle.DefaultScaleInLifecycleAdapter{LabelManager: lifeCycleLabelManager} + scaleInOpsLifecycleAdapter := xsetController.GetScaleInOpsLifecycleAdapter() + if scaleInOpsLifecycleAdapter == nil { + scaleInOpsLifecycleAdapter = &opslifecycle.DefaultScaleInLifecycleAdapter{LabelManager: lifeCycleLabelManager} } updateLifecycleAdapter := xsetController.GetUpdateOpsLifecycleAdapter() if updateLifecycleAdapter == nil { @@ -86,7 +86,7 @@ func NewRealSyncControl(reconcileMixIn *mixin.ReconcilerMixin, recorder: reconcileMixIn.Recorder, opsLifecycleMgr: lifeCycleLabelManager, - scaleInLifecycleAdapter: scaleInOpsLicecycleAdapter, + scaleInLifecycleAdapter: scaleInOpsLifecycleAdapter, updateLifecycleAdapter: updateLifecycleAdapter, cacheExpectation: cacheExpectation, targetGVK: targetGVK, @@ -101,7 +101,7 @@ func NewRealSyncControl(reconcileMixIn *mixin.ReconcilerMixin, xsetGVK: xsetGVK, targetGVK: targetGVK, - scaleInLifecycleAdapter: scaleInOpsLicecycleAdapter, + scaleInLifecycleAdapter: scaleInOpsLifecycleAdapter, updateLifecycleAdapter: updateLifecycleAdapter, } }