refactor: reuse SchedulingPolicy struct for the scheduling policy definition of InstanceTemplate #7290

starnop · 2024-05-09T09:57:00Z

Reuse SchedulingPolicy struct for the scheduling policy definition of InstanceTemplate

CLAassistant · 2024-05-09T09:57:07Z

All committers have signed the CLA.

free6om · 2024-05-09T10:14:31Z

apis/apps/v1alpha1/cluster_types.go

+	// Deprecated since v0.10, replaced by the `schedulingPolicy` field.
+	//
+	// +kubebuilder:deprecatedversion:warning="This field has been deprecated since 0.10.0"
+	// +kubebuilder:pruning:PreserveUnknownFields
 	// +optional
 	NodeName *string `json:"nodeName,omitempty"`

 	// Defines NodeSelector to override.
+	//
+	// Deprecated since v0.10, replaced by the `schedulingPolicy` field.
+	//
+	// +kubebuilder:deprecatedversion:warning="This field has been deprecated since 0.10.0"
+	// +kubebuilder:pruning:PreserveUnknownFields
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`

 	// Tolerations specifies a list of tolerations to be applied to the Pod, allowing it to tolerate node taints.
 	// This field can be used to add new tolerations or override existing ones.
 	//
+	// Deprecated since v0.10, replaced by the `schedulingPolicy` field.
+	//
+	// +kubebuilder:deprecatedversion:warning="This field has been deprecated since 0.10.0"
+	// +kubebuilder:pruning:PreserveUnknownFields
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`


should remove them directly as they are introduced in the 0.9

free6om · 2024-05-09T10:16:54Z

Makefile

@@ -22,6 +22,8 @@ TEST_TYPE ?= wesql
 GIT_COMMIT  = $(shell git rev-list -1 HEAD)
 GIT_VERSION = $(shell git describe --always --abbrev=0 --tag)
 GENERATED_CLIENT_PKG = "pkg/client"
+GENERATED_DEEP_COPY_FILE = "zz_generated.deepcopy.go"


suggest not to modify the unrelated files of the issue that this PR tries to resolve.

free6om · 2024-05-09T10:17:22Z

missing the controller part.

free6om · 2024-05-10T11:22:41Z

pkg/controller/instanceset/instance_util.go

@@ -586,12 +586,12 @@ func buildInstanceTemplateExt(template workloads.InstanceTemplate, templateExt *
 		replicas = *template.Replicas
 	}
 	templateExt.Replicas = replicas
-	if template.NodeName != nil {
-		templateExt.Spec.NodeName = *template.NodeName
+	if template.SchedulingPolicy.NodeName != "" {


do nil check of SchedulingPolicy

The SchedulingPolicy is not a pointer here.

Indeed SchedulingPolicy should be optional. The pointer type is more appropriate. I will modify it.

@free6om PTAL again, THX

weicao · 2024-05-13T09:59:45Z

pkg/controller/instanceset/instance_util.go

@@ -651,6 +664,105 @@ func mergeCPUNMemory(s, d *corev1.ResourceList) {
 	}
 }

+func mergeAffinity(affinity1Ptr, affinity2Ptr **corev1.Affinity) {


Seems we have two mergeAffinity now.

Should be addressed in the future pr.

@weicao 👍 I didn't find a similar method before, I'll see if I can reuse it directly.

@weicao 👍 I didn't find a similar method before, I'll see if I can reuse it directly.

in pkg/controller/scheduling/scheduling_utils.go

The two function implementations are different. The previous implementation is a direct accumulation, and my implementation is merged if the key is the same.

Can a TODO action be added first, and then create a separate PR to merge these two methods? @free6om

…inition of InstanceTemplate Signed-off-by: starnop <starnop@163.com>

free6om · 2024-06-04T06:19:54Z

/cherry-pick release-0.9

github-actions · 2024-06-04T06:20:22Z

🤖 says: cherry pick action finished successfully 🎉!
See: https://github.com/apecloud/kubeblocks/actions/runs/9362213591

…inition of InstanceTemplate (#7290) Signed-off-by: starnop <starnop@163.com> (cherry picked from commit d7dd465)

…licy definition of InstanceTemplate (#7290)" This reverts commit 9c4f71d.

…ling policy definition of InstanceTemplate (#7290)" (#7481)

…inition of InstanceTemplate (apecloud#7290) Signed-off-by: starnop <starnop@163.com> (cherry picked from commit d7dd465)

starnop requested review from nayutah, ldming, heng4fun, free6om, wangyelei, Y-Rookie and weicao as code owners May 9, 2024 09:57

github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label May 9, 2024

apecloud-bot added the approved PR Approved Test label May 9, 2024

JashBook removed the approved PR Approved Test label May 9, 2024

apecloud-bot added the area/user-interaction label May 9, 2024

apecloud-bot requested a review from realzyy May 9, 2024 10:07

free6om requested a review from leon-inf May 9, 2024 10:11

free6om reviewed May 9, 2024

View reviewed changes

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from 2eef999 to c156c53 Compare May 10, 2024 02:30

apecloud-bot added the approved PR Approved Test label May 10, 2024

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from c156c53 to fc7860f Compare May 10, 2024 03:10

apecloud-bot added approved PR Approved Test and removed approved PR Approved Test labels May 10, 2024

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from fc7860f to 5f15feb Compare May 10, 2024 06:24

apecloud-bot added approved PR Approved Test and removed approved PR Approved Test labels May 10, 2024

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from 5f15feb to acc038a Compare May 10, 2024 06:33

apecloud-bot added approved PR Approved Test and removed approved PR Approved Test labels May 10, 2024

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from acc038a to bfd640e Compare May 10, 2024 08:38

apecloud-bot added approved PR Approved Test and removed approved PR Approved Test labels May 10, 2024

free6om reviewed May 10, 2024

View reviewed changes

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from 462f2e1 to b5f3908 Compare May 11, 2024 02:40

apecloud-bot added approved PR Approved Test and removed approved PR Approved Test labels May 11, 2024

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from b5f3908 to 3c4fe93 Compare May 11, 2024 02:43

apecloud-bot added approved PR Approved Test and removed approved PR Approved Test labels May 11, 2024

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from 3c4fe93 to 7307c4e Compare May 11, 2024 02:56

apecloud-bot added approved PR Approved Test and removed approved PR Approved Test labels May 11, 2024

free6om approved these changes May 13, 2024

View reviewed changes

nayutah approved these changes May 13, 2024

View reviewed changes

weicao reviewed May 13, 2024

View reviewed changes

starnop force-pushed the reuse-SchedulingPolicy-for-InstanceTemplate branch from 7307c4e to 05ca8f0 Compare June 3, 2024 12:09

apecloud-bot removed the approved PR Approved Test label Jun 3, 2024

refactor: reuse SchedulingPolicy struct for the scheduling policy def…

05ca8f0

…inition of InstanceTemplate Signed-off-by: starnop <starnop@163.com>

apecloud-bot added the pre-approve Fork PR Pre Approve Test label Jun 3, 2024

weicao self-requested a review June 4, 2024 03:09

weicao approved these changes Jun 4, 2024

View reviewed changes

free6om merged commit d7dd465 into apecloud:main Jun 4, 2024
18 checks passed

github-actions bot added this to the Release 0.9.0 milestone Jun 4, 2024

github-actions bot pushed a commit that referenced this pull request Jun 4, 2024

refactor: reuse SchedulingPolicy struct for the scheduling policy def…

9c4f71d

…inition of InstanceTemplate (#7290) Signed-off-by: starnop <starnop@163.com> (cherry picked from commit d7dd465)

free6om added the ks label Jun 4, 2024

free6om added a commit that referenced this pull request Jun 4, 2024

Revert "refactor: reuse SchedulingPolicy struct for the scheduling po…

2ada786

…licy definition of InstanceTemplate (#7290)" This reverts commit 9c4f71d.

free6om added a commit that referenced this pull request Jun 4, 2024

chore: Revert "refactor: reuse SchedulingPolicy struct for the schedu…

51957d7

…ling policy definition of InstanceTemplate (#7290)" (#7481)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: reuse SchedulingPolicy struct for the scheduling policy definition of InstanceTemplate #7290

refactor: reuse SchedulingPolicy struct for the scheduling policy definition of InstanceTemplate #7290

starnop commented May 9, 2024 •

edited

CLAassistant commented May 9, 2024 •

edited

free6om May 9, 2024

starnop May 10, 2024

free6om May 9, 2024

free6om commented May 9, 2024

free6om May 10, 2024

starnop May 11, 2024

starnop May 11, 2024

starnop May 11, 2024

weicao May 13, 2024

starnop May 15, 2024

free6om May 16, 2024

starnop Jun 3, 2024

weicao Jun 4, 2024

free6om commented Jun 4, 2024

github-actions bot commented Jun 4, 2024

refactor: reuse SchedulingPolicy struct for the scheduling policy definition of InstanceTemplate #7290

refactor: reuse SchedulingPolicy struct for the scheduling policy definition of InstanceTemplate #7290

Conversation

starnop commented May 9, 2024 • edited

CLAassistant commented May 9, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

free6om commented May 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

free6om commented Jun 4, 2024

github-actions bot commented Jun 4, 2024

starnop commented May 9, 2024 •

edited

CLAassistant commented May 9, 2024 •

edited