Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support to specify k8s scheduling policy in cluster API #7071

Merged
merged 6 commits into from
Apr 19, 2024

Conversation

leon-inf
Copy link
Contributor

resolve #6849

@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines. label Apr 16, 2024
@leon-inf leon-inf force-pushed the feature/k8s-scheduling-policies branch from 537e861 to bff1b44 Compare April 16, 2024 08:10
@github-actions github-actions bot added size/XXL Denotes a PR that changes 1000+ lines. and removed size/M Denotes a PR that changes 30-99 lines. labels Apr 16, 2024
@leon-inf leon-inf force-pushed the feature/k8s-scheduling-policies branch 5 times, most recently from b5e8a17 to da02163 Compare April 16, 2024 09:23
Copy link

codecov bot commented Apr 16, 2024

Codecov Report

Attention: Patch coverage is 44.09449% with 71 lines in your changes are missing coverage. Please review.

Project coverage is 65.56%. Comparing base (1b84c11) to head (ee88751).

Files Patch % Lines
pkg/controller/scheduling/scheduling_utils.go 37.93% 47 Missing and 7 partials ⚠️
pkg/controller/component/synthesize_component.go 55.00% 7 Missing and 2 partials ⚠️
pkg/controller/component/component.go 40.00% 2 Missing and 1 partial ⚠️
pkg/controller/plan/restore.go 66.66% 2 Missing and 1 partial ⚠️
pkg/controller/builder/builder_component.go 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7071      +/-   ##
==========================================
- Coverage   65.56%   65.56%   -0.01%     
==========================================
  Files         341      341              
  Lines       41968    42027      +59     
==========================================
+ Hits        27517    27555      +38     
- Misses      12069    12087      +18     
- Partials     2382     2385       +3     
Flag Coverage Δ
unittests 65.56% <44.09%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@leon-inf leon-inf force-pushed the feature/k8s-scheduling-policies branch from da02163 to 5fa60b7 Compare April 16, 2024 09:37
@leon-inf leon-inf requested a review from iziang April 16, 2024 09:38
@leon-inf leon-inf added this to the Release 0.10.0 milestone Apr 17, 2024
@leon-inf leon-inf force-pushed the feature/k8s-scheduling-policies branch from 5fa60b7 to 4c94ddf Compare April 17, 2024 03:25
@leon-inf leon-inf changed the title feat: support to specify k8s scheduling policies in cluster API feat: support to specify k8s scheduling policy in cluster API Apr 17, 2024
@leon-inf leon-inf force-pushed the feature/k8s-scheduling-policies branch from f7a5831 to dbc168d Compare April 17, 2024 03:32
@leon-inf leon-inf marked this pull request as ready for review April 17, 2024 03:33
@leon-inf leon-inf force-pushed the feature/k8s-scheduling-policies branch from 4e939d9 to 9081fd9 Compare April 17, 2024 08:19
@leon-inf leon-inf force-pushed the feature/k8s-scheduling-policies branch from 9081fd9 to 01333d6 Compare April 17, 2024 08:26
@leon-inf leon-inf merged commit 1471969 into main Apr 19, 2024
81 checks passed
@leon-inf leon-inf deleted the feature/k8s-scheduling-policies branch April 19, 2024 06:35
@free6om
Copy link
Contributor

free6om commented Jun 12, 2024

/cherry-pick release-0.9

Copy link

🤖 says: Error cherry-picking.

Auto-merging apis/apps/v1alpha1/cluster_types.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/cluster_types.go
Auto-merging apis/apps/v1alpha1/component_types.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/component_types.go
Auto-merging apis/apps/v1alpha1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/zz_generated.deepcopy.go
Auto-merging config/crd/bases/apps.kubeblocks.io_clusters.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_components.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_components.yaml
Auto-merging controllers/apps/cluster_controller_test.go
Auto-merging deploy/helm/crds/apps.kubeblocks.io_clusters.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_components.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_components.yaml
Auto-merging docs/developer_docs/api-reference/cluster.md
CONFLICT (content): Merge conflict in docs/developer_docs/api-reference/cluster.md
Auto-merging pkg/controller/builder/builder_component.go
Auto-merging pkg/controller/component/component.go
CONFLICT (content): Merge conflict in pkg/controller/component/component.go
Auto-merging pkg/controller/component/synthesize_component.go
CONFLICT (content): Merge conflict in pkg/controller/component/synthesize_component.go
Auto-merging pkg/controller/plan/restore.go
CONFLICT (content): Merge conflict in pkg/controller/plan/restore.go
Auto-merging pkg/controller/scheduling/scheduling_utils.go
error: could not apply 1471969... feat: support to specify k8s scheduling policy in cluster API (#7071)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Copy link

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks/actions/runs/9476000308

@cjc7373
Copy link
Contributor

cjc7373 commented Aug 15, 2024

@leon-inf Could you please cherry-pick this PR to 0.9? I have a feature which depends on the custom scheduler support.

@leon-inf
Copy link
Contributor Author

leon-inf commented Sep 4, 2024

@leon-inf Could you please cherry-pick this PR to 0.9? I have a feature which depends on the custom scheduler support.

#8081

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/user-interaction size/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Features] support standard kubernetes affinity scheduling rules
6 participants