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

Ability to specify default tolerations via the buildconfig defaulter #6579

Merged
merged 1 commit into from
Jan 11, 2018
Merged

Ability to specify default tolerations via the buildconfig defaulter #6579

merged 1 commit into from
Jan 11, 2018

Conversation

coreydaley
Copy link
Member

@coreydaley coreydaley commented Jan 2, 2018

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 2, 2018
@coreydaley
Copy link
Member Author

@coreydaley coreydaley changed the title [WIP] Ability to specify default tolerations via the buildconfig defaulter Ability to specify default tolerations via the buildconfig defaulter Jan 6, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 6, 2018
@coreydaley
Copy link
Member Author

@bparees is there any kind of test that I can/need to add for the buildoverride tolerations?

@bparees
Copy link
Contributor

bparees commented Jan 6, 2018

@bparees is there any kind of test that I can/need to add for the buildoverride tolerations?

not that i'm aware of. @sdodson or @ewolinetz would know better. But you should manually test it, at a minimum.

@coreydaley
Copy link
Member Author

/retest

@sdodson
Copy link
Member

sdodson commented Jan 9, 2018

The CI jobs will just ensure you haven't broken the default case, it won't exercise that this change actually takes effect though.

@coreydaley
Copy link
Member Author

@bparees @sdodson ptal
I was able to configure and run the openshift-ansible installer on centos7 and adding the following line to my /etc/ansible/hosts file
openshift_buildoverrides_tolerations=[{'key':'mykey1','value':'myvalue1','effect':'NoSchedule','operator':'Equal'}]

resulted in this being added to my /etc/origin/master/master-config.yaml file

BuildOverrides:
      configuration:
        apiVersion: v1
        kind: BuildOverridesConfig
        tolerations:
        - effect: NoSchedule
          key: mykey1
          operator: Equal
          value: myvalue1

And creating a new application via
$ oc new-app centos/ruby-22-centos7~https://github.com/openshift/ruby-ex.git
resulted in the following being added to the build pod spec
$ oc get po/ruby-ex-1-build -o yaml

tolerations:
- effect: NoSchedule
  key: mykey1
  operator: Equal
  value: myvalue1

@sdodson
Copy link
Member

sdodson commented Jan 9, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2018
@coreydaley
Copy link
Member Author

/retest

@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2018
@coreydaley
Copy link
Member Author

/retest

3 similar comments
@coreydaley
Copy link
Member Author

/retest

@coreydaley
Copy link
Member Author

/retest

@coreydaley
Copy link
Member Author

/retest

@coreydaley
Copy link
Member Author

@sdodson Can I get another lgtm please? I didn't change anything I just rebased, and all tests are passing now.

@sdodson
Copy link
Member

sdodson commented Jan 10, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2018
@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@coreydaley
Copy link
Member Author

/retest

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit c557047 into openshift:master Jan 11, 2018
@openshift-ci-robot
Copy link

@coreydaley: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install_crio f3e3f5d link /test crio

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants