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

schedconf: consume deployer updates #734

Merged
merged 3 commits into from
Oct 31, 2023
Merged

Conversation

ffromani
Copy link
Member

@ffromani ffromani commented Oct 23, 2023

consume deployer update to mutate scheduler config using unstructured, which significantly lowers the dependencies footprint. This also enables us to pull the latest kubernetes dependencies.

Although there is no expected change of behavior, this change is significant in deployer code and needs proper testing.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 23, 2023
@ffromani
Copy link
Member Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 23, 2023
@openshift-ci openshift-ci bot requested review from shajmakh and Tal-or October 23, 2023 14:51
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ffromani

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 23, 2023
@ffromani ffromani force-pushed the sched-render-config-unstruct branch from c65e341 to a4f7c57 Compare October 23, 2023 15:09
@ffromani ffromani requested a review from swatisehgal October 23, 2023 15:13
@ffromani ffromani force-pushed the sched-render-config-unstruct branch from a4f7c57 to b5de7b4 Compare October 24, 2023 12:10
@ffromani ffromani changed the title WIP DNM testing in progress schedconf: consume deployer updates Oct 25, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 25, 2023
@ffromani ffromani force-pushed the sched-render-config-unstruct branch from b5de7b4 to 70e81e6 Compare October 25, 2023 17:09
@ffromani ffromani requested a review from jlojosnegros October 26, 2023 10:51
@ffromani ffromani force-pushed the sched-render-config-unstruct branch from 70e81e6 to 0125ae8 Compare October 27, 2023 19:39
port to the new APIs.
Reduce significantly the dependencies footprint.

Signed-off-by: Francesco Romani <[email protected]>
also update transitive dependencies

Signed-off-by: Francesco Romani <[email protected]>
new dep pulled by ginkgo

Signed-off-by: Francesco Romani <[email protected]>
@ffromani ffromani force-pushed the sched-render-config-unstruct branch from 7e5e42a to 1034cdb Compare October 31, 2023 11:00
@ffromani
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2023
@ffromani ffromani added the cherry-pick-candidate Possible cherry-pick in the future label Oct 31, 2023
@ffromani
Copy link
Member Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@ffromani: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ffromani ffromani merged commit 529d872 into main Oct 31, 2023
5 checks passed
@ffromani ffromani deleted the sched-render-config-unstruct branch October 31, 2023 14:43
@openshift-cherrypick-robot

@ffromani: #734 failed to apply on top of branch "release-4.14":

Applying: deps: update to deployer v0.12.2
Using index info to reconstruct a base tree...
M	controllers/numaresourcesscheduler_controller.go
M	pkg/objectupdate/sched/sched.go
Falling back to patching base and 3-way merge...
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/zz_generated.deepcopy.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta3/zz_generated.defaults.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta3/zz_generated.deepcopy.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta3/zz_generated.conversion.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta3/types.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta3/register.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta3/doc.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta3/defaults.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta3/conversion.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta2/zz_generated.defaults.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta2/zz_generated.deepcopy.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta2/zz_generated.conversion.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta2/types.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta2/register.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta2/doc.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta2/defaults.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/v1beta2/conversion.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/types.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/scheme/scheme.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/register.go
Removing vendor/sigs.k8s.io/scheduler-plugins/apis/config/doc.go
Removing vendor/sigs.k8s.io/scheduler-plugins/LICENSE
Removing vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/names/names.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/zz_generated.deepcopy.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3/zz_generated.defaults.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3/zz_generated.deepcopy.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3/zz_generated.conversion.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3/register.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3/doc.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3/defaults.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3/default_plugins.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3/conversion.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2/zz_generated.defaults.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2/zz_generated.deepcopy.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2/zz_generated.conversion.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2/register.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2/doc.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2/defaults.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2/default_plugins.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2/conversion.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1/zz_generated.defaults.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1/zz_generated.deepcopy.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1/zz_generated.conversion.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1/register.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1/doc.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1/defaults.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1/default_plugins.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/v1/conversion.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/types_pluginargs.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/types.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/scheme/scheme.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/register.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/doc.go
Removing vendor/k8s.io/kubernetes/pkg/scheduler/apis/config/OWNERS
Removing vendor/k8s.io/kubernetes/pkg/features/kube_features.go
Removing vendor/k8s.io/kubernetes/pkg/features/OWNERS
Removing vendor/k8s.io/kubernetes/LICENSE
Removing vendor/k8s.io/kube-scheduler/config/v1beta3/zz_generated.deepcopy.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta3/types_pluginargs.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta3/types.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta3/register.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta3/doc.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta2/zz_generated.deepcopy.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta2/types_pluginargs.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta2/types.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta2/register.go
Removing vendor/k8s.io/kube-scheduler/config/v1beta2/doc.go
Removing vendor/k8s.io/kube-scheduler/config/v1/zz_generated.deepcopy.go
Removing vendor/k8s.io/kube-scheduler/config/v1/types_pluginargs.go
Removing vendor/k8s.io/kube-scheduler/config/v1/types.go
Removing vendor/k8s.io/kube-scheduler/config/v1/register.go
Removing vendor/k8s.io/kube-scheduler/config/v1/doc.go
Removing vendor/k8s.io/kube-scheduler/LICENSE
Removing vendor/k8s.io/apiserver/pkg/util/feature/feature_gate.go
Removing vendor/k8s.io/apiserver/pkg/features/kube_features.go
Removing vendor/k8s.io/apiserver/pkg/features/OWNERS
Removing vendor/k8s.io/apiserver/LICENSE
Auto-merging pkg/objectupdate/sched/sched.go
Removing pkg/objectupdate/sched/compat_test.go
Removing pkg/objectupdate/sched/compat.go
Auto-merging controllers/numaresourcesscheduler_controller.go
Applying: deps: bump to latest kubernetes libs
Applying: snyk: ignore slim-sprig
Using index info to reconstruct a base tree...
A	.snyk
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .snyk deleted in HEAD and modified in snyk: ignore slim-sprig. Version snyk: ignore slim-sprig of .snyk left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 snyk: ignore slim-sprig
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ffromani ffromani added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherry-pick-candidate Possible cherry-pick in the future
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants