Skip to content

Conversation

@kevin-wangzefeng
Copy link
Member

An example of hosting scheduler code in-tree

/hold

k8s-ci-robot and others added 30 commits January 12, 2019 01:53
Added name when register plugin.
Added SchedulerConfiguration type.
Add Unschedulable PodCondition for pods in pending
Signed-off-by: Da K. Ma <[email protected]>
Reduce verbosity level for recurring logs
Signed-off-by: Da K. Ma <[email protected]>
Removed reclaim&preempt by default.
Signed-off-by: Da K. Ma <[email protected]>
Signed-off-by: Da K. Ma <[email protected]>
@volcano-sh-bot
Copy link
Contributor

Welcome @kevin-wangzefeng!

It looks like this is your first PR to volcano-sh/volcano 🎉.

Thank you, and welcome to Volcano. 😃

@volcano-sh-bot volcano-sh-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 28, 2019
@volcano-sh-bot volcano-sh-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 28, 2019
@kevin-wangzefeng
Copy link
Member Author

scripts to sync scheduler code in-tree, with subtree command

# In main repo
UPSTREAM=scheduler

git remote add ${UPSTREAM} https://github.com/volcano-sh/scheduler.git
git fetch ${UPSTREAM}

# Check in code with history from upstream repo
PATH_TO_SYNC=(pkg/scheduler pkg/apis/scheduling pkg/apis/utils)
for PTS in $PATH_TO_SYNC
do
  echo "checking in ${PTS} code with history from ${UPSTREAM}"
  git read-tree --prefix=${PTS} ${UPSTREAM}/master:${PTS}
  git checkout -- ${PTS}
done


NEW_COMMIT=$(git write-tree)
PARENT_A=$(git rev-parse HEAD)
PARENT_B=$(git rev-parse ${UPSTREAM}/master)

# commit subtree updates
echo "update in-tree ${UPSTREAM} code" | \
git commit-tree $NEW_COMMIT -p $PARENT_A -p $PARENT_B | \
git reset

echo "done"

To sync changes happened in-tree to scheduler later on, if necessary, simply execute similar commands in the scheduler repo.

@kevin-wangzefeng
Copy link
Member Author

/approve cancel

@volcano-sh-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign quinton-hoole
You can assign the PR to them by writing /assign @quinton-hoole in a comment when ready.

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

Details 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

@volcano-sh-bot volcano-sh-bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 28, 2019
@kevin-wangzefeng
Copy link
Member Author

Closing in favor of #288

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.