summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3595 from ↵Jan Chaloupka2017-03-081-0/+1
|\ | | | | | | | | ingvagabund/check-docker-excluder-status-only-when-it-is-enabled Ignore the docker excluder status if it is not enabled by a user
| * ignore the docker excluder status if it is not enabled by a userJan Chaloupka2017-03-081-0/+1
|/
* Merge pull request #3585 from tbielawa/petset_early_failScott Dodson2017-03-073-3/+53
|\ | | | | Petset early fail
| * Fix pylint/pyflakes errors on masterScott Dodson2017-03-072-3/+4
| |
| * Identify PetSets in 3.4 clusters and fail if any are detectedTim Bielawa2017-03-071-0/+49
|/ | | | | | | | | | | * PetSets are deprecated in 3.5, replaced with StatefulSets * We can not automatically migrate between the two * Red Hat has never supported PetSets nor do we support StatefulSets * Gracefully handles invalid resource queries if ran against 3.5+ clusters * Fails out with explanation and ref docs if petsets are detected Reference bug: https://bugzilla.redhat.com/show_bug.cgi?id=1428229
* Merge pull request #3558 from ewolinetz/logging_metrics_defaultsScott Dodson2017-03-0710-24/+52
|\ | | | | Adding some more logging and metrics defaults
| * More logging fixesewolinetz2017-03-074-8/+4
| |
| * Fixing plugin, nodeselectors, and secret pull checkewolinetz2017-03-075-6/+15
| |
| * Updating metrics defaultsewolinetz2017-03-062-6/+9
| |
| * Adding some more logging defaultsewolinetz2017-03-035-11/+31
| |
* | Merge pull request #3529 from ingvagabund/upgrade-excluders-in-upgrade-onlyJan Chaloupka2017-03-0726-96/+284
|\ \ | | | | | | WIP: update excluders to latest by default, in non-upgrade scenarios do not update
| * | - update excluders to latest, in non-upgrade scenarios do not updateJan Chaloupka2017-03-0726-96/+284
| | | | | | | | | | | | | | | | | | - check both available excluder versions are at most of upgrade target version - get excluder status through status command - make excluders enablement configurable
* | | Merge pull request #3588 from mtnbikenc/docker-fixScott Dodson2017-03-071-1/+1
|\ \ \ | | | | | | | | Bug 1416156: Loosely couple docker to iptables service
| * | | Loosely couple docker to iptables serviceRussell Teague2017-03-071-1/+1
| | | |
* | | | Merge pull request #3574 from sdodson/35_sdnvalidatorScott Dodson2017-03-076-3/+47
|\ \ \ \ | |/ / / |/| | | Add oc_objectvalidator to upgrade check
| * | | Generic message directing people to contact supportScott Dodson2017-03-073-3/+21
| | | |
| * | | Add oc_objectvalidator to upgrade checkScott Dodson2017-03-073-0/+26
| | | |
* | | | Merge pull request #3565 from ↵Andrew Butcher2017-03-071-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | EricMountain-1A/fix_upstream_docker_registries_order Preserve order of Docker registries
| * | | | Preserve order of Docker registriesEric Mountain2017-03-071-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List of additional/blocked/insecure Docker registries was being converted to a set, thereby dropping the original order. Fixed to preserve order of the registries (this allows prioritising registries).
* | | | | Merge pull request #3582 from kwoodson/router_sharding_docScott Dodson2017-03-072-1/+89
|\ \ \ \ \ | | | | | | | | | | | | Augmenting documentation for router sharding.
| * | | | | Adding into the origin inventory doc.Kenny Woodson2017-03-071-1/+45
| | | | | |
| * | | | | Augmenting documentation for router sharding.Kenny Woodson2017-03-071-0/+44
|/ / / / /
* / / / / openshift_facts: ensure system containers deps are installedGiuseppe Scrivano2017-03-072-0/+14
|/ / / / | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3517 from ewolinetz/idempotency_role_bindingsEric Wolinetz2017-03-061-4/+20
|\ \ \ \ | | | | | | | | | | Adding changed_whens for role, rolebinding, and scc reconciliation ba…
| * | | | Updating stdout check for changed_whenewolinetz2017-03-021-5/+5
| | | | |
| * | | | Resolving yammlint errorsewolinetz2017-03-011-8/+8
| | | | |
| * | | | Adding changed_whens for role, rolebinding, and scc reconciliation based on ↵ewolinetz2017-02-281-4/+20
| | | | | | | | | | | | | | | | | | | | output from oadm policy command
* | | | | Enable coveralls.ioJason DeTiberus2017-03-062-1/+5
| |/ / / |/| | |
* | | | Merge pull request #3575 from sdodson/BZ1423430Scott Dodson2017-03-061-1/+1
|\ \ \ \ | | | | | | | | | | Fix indentation of run_once
| * | | | Fix indentation of run_onceScott Dodson2017-03-061-1/+1
|/ / / / | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1423430
* | | | Merge pull request #3569 from detiber/consolidateToxJason DeTiberus2017-03-0616-279/+44
|\ \ \ \ | | | | | | | | | | Consolidate root/utils tests
| * | | | Update docs for test consolidation and remove the MakefileJason DeTiberus2017-03-063-169/+6
| | | | |
| * | | | Consolidate root/utils testsJason DeTiberus2017-03-0613-110/+38
| | | | | | | | | | | | | | | | | | | | - Consolidate tests between the root of the repo and utils
* | | | | Merge pull request #3570 from rhcarvalho/more-misc-cleanupJason DeTiberus2017-03-0616-324/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove lots of dead code in tests
| * | | | | Remove dummy setup/teardown methodsRodolfo Carvalho2017-03-0613-104/+0
| | | | | |
| * | | | | Clean up test filesRodolfo Carvalho2017-03-0615-181/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are not executable anymore, and tests are now meant to be run through pytest.
| * | | | | Remove commented-out test codeRodolfo Carvalho2017-03-061-39/+0
|/ / / / /
* | | | | Merge pull request #3535 from enj/enj/f/reserve_ns_moduleScott Dodson2017-03-068-578/+1051
|\ \ \ \ \ | | | | | | | | | | | | Add pre-upgrade check for reserved namespaces
| * | | | | Make generic OCObjectValidator from OCSDNValidatorMonis Khan2017-03-068-578/+1051
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Monis Khan <mkhan@redhat.com>
* | | | | Merge pull request #3567 from richm/logging-needs-openshift_master_factsScott Dodson2017-03-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | logging needs openshift_master_facts before openshift_facts
| * | | | | logging needs openshift_master_facts before openshift_factsRich Megginson2017-03-061-0/+1
| |/ / / /
* | | | | Merge pull request #3382 from codificat/playbook2imageScott Dodson2017-03-065-20/+105
|\ \ \ \ \ | |/ / / / |/| | | | Dockerfile and docs to run containerized playbooks
| * | | | Dockerfile and docs to run containerized playbooksPep Turró Mauri2017-03-065-20/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update openshift-ansible's Dockerfile to use playbook2image as a base, with the goal to run an arbitrary playbook from a container. The existing Dockerfile is moved to Dockerfile.rhel7 for the productized version and will be updated to use playbook2image later.
* | | | | Merge pull request #3566 from detiber/testConfigsJason DeTiberus2017-03-064-28/+23
|\ \ \ \ \ | |/ / / / |/| | | | separate out test tool configs from setup.cfg
| * | | | separate out test tool configs from setup.cfgJason DeTiberus2017-03-064-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | | Since we are moving away from setuptools for invoking tests, lets move the configs for the different test tools into their own configs.
* | | | | Merge pull request #3549 from kwoodson/router_shardingScott Dodson2017-03-062-61/+54
|\ \ \ \ \ | | | | | | | | | | | | Adding support for multiple router shards.
| * | | | | Added ports.Kenny Woodson2017-03-022-0/+6
| | | | | |
| * | | | | Fixed router name to produce 2nd router.Kenny Woodson2017-03-021-1/+1
| | | | | |
| * | | | | Updated to work with an array of routers.Kenny Woodson2017-03-022-61/+19
| | | | | |
| * | | | | Adding support for router sharding.Kenny Woodson2017-03-022-61/+90
| | | | | |