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

adding 'oc set resources' #11384

Merged
merged 2 commits into from
Oct 23, 2016
Merged

Conversation

JacobTanenbaum
Copy link
Contributor

intial commit to add a command to set resource requests/limits on
running pods.

@liggitt
Copy link
Contributor

liggitt commented Oct 16, 2016

Don't we want this upstreamed at the same time?

@knobunc
Copy link
Contributor

knobunc commented Oct 17, 2016

@liggitt: This just merged upstream as kubernetes/kubernetes#27206. @eparis and I wanted to get this into OpenShift 1.4 so we have to carry our own version for a release. When the kubectl set stuff makes it into OpenShift, this version should be replaced. But since @JacobTanenbaum implemented both, he is keeping the OpenShift version as close to the upstream Kube version as possible, while still working within the existing 'oc set' framework. Is there a better approach that we should take to get this in?

@JacobTanenbaum JacobTanenbaum force-pushed the add_limit branch 7 times, most recently from 4c0079c to 49d547e Compare October 18, 2016 18:18
@eparis
Copy link
Member

eparis commented Oct 18, 2016

@fabianofranz maybe you can help here...

@eparis
Copy link
Member

eparis commented Oct 18, 2016

[test]

@pweil-
Copy link

pweil- commented Oct 19, 2016

@openshift/cli-review @Kargakis

@knobunc
Copy link
Contributor

knobunc commented Oct 19, 2016

@0xmichalis
Copy link
Contributor

Why don't you cherry-pick kubernetes/kubernetes#27206 in our vendor dir as an UPSTREAM commit instead of bringing it in oc?

@fabianofranz
Copy link
Member

Why don't you cherry-pick kubernetes/kubernetes#27206 in our vendor dir as an UPSTREAM commit instead of bringing it in oc?

+1, if the command code is the same we should cherry-pick as an UPSTREAM commit. Documentation here.

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 19, 2016
@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 20, 2016
@0xmichalis
Copy link
Contributor

The commit message should be: UPSTREAM: 27206: Add kubectl set resources

@0xmichalis
Copy link
Contributor

And you also need to update completions and docs:

./hack/update-generated-completions.sh
./hack/update-generated-docs.sh

@JacobTanenbaum JacobTanenbaum force-pushed the add_limit branch 2 times, most recently from 470b556 to e408a01 Compare October 21, 2016 12:46
@JacobTanenbaum
Copy link
Contributor Author

[test]

@knobunc
Copy link
Contributor

knobunc commented Oct 21, 2016

[test] in case @JacobTanenbaum was being ignored

@eparis
Copy link
Member

eparis commented Oct 21, 2016

[merge]

@knobunc
Copy link
Contributor

knobunc commented Oct 21, 2016

[test] since Jenkins seemed to explode on the last one.

@JacobTanenbaum
Copy link
Contributor Author

[test]

@JacobTanenbaum
Copy link
Contributor Author

[test]

@eparis
Copy link
Member

eparis commented Oct 23, 2016

[test][merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to c2def54

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to c2def54

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 23, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10500/) (Base Commit: 2047a73) (Image: devenv-rhel7_5232)

@openshift-bot openshift-bot merged commit 7ae5feb into openshift:master Oct 23, 2016
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10499/) (Base Commit: 2047a73)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants