summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3600 from tbielawa/etcd_is_atomic-BZ1427067OpenShift Bot2017-03-094-2/+20
|\ | | | | Merged by openshift-bot
| * Remove debug taskTim Bielawa2017-03-091-3/+0
| |
| * New roleTim Bielawa2017-03-084-2/+23
| |
* | Merge pull request #3605 from kwoodson/oc_adm_policy_user_fixOpenShift Bot2017-03-096-54/+5319
|\ \ | | | | | | Merged by openshift-bot
| * | Fixing the way policies are found. The old method was unreliable. This ↵Kenny Woodson2017-03-086-54/+5319
| |/ | | | | | | method searches all and matches on properties.
* | Merge pull request #3590 from kwoodson/router_registry_unit_testsAndrew Butcher2017-03-0926-51/+915
|\ \ | | | | | | Fix to OpenshiftCLIConfig to support an sorted keys. Removed redundant get.
| * | Lowering test coverage percentage.Kenny Woodson2017-03-081-1/+1
| | |
| * | Removing ordereddict. Replaced with sorted keys.Kenny Woodson2017-03-0826-95/+97
| | |
| * | Fixed for linting.Kenny Woodson2017-03-082-5/+1
| | |
| * | Fix to OpenshiftCLIConfig to support an ordereddict. This was breaking test ↵Kenny Woodson2017-03-0726-115/+420
| | | | | | | | | | | | cases.
| * | Adding test_oc_adm_router.Kenny Woodson2017-03-071-0/+476
| | |
| * | Adding router test.Kenny Woodson2017-03-071-0/+85
| | |
* | | Merge pull request #3586 from srampal/issue3541Scott Dodson2017-03-094-1/+36
|\ \ \ | | | | | | | | Fix for issue 3541
| * | | Fix for issue 3541Sanjeev Rampal2017-03-074-1/+36
| | | |
* | | | Merge pull request #3607 from ingvagabund/extend-excluders-to-containerized-ocpJan Chaloupka2017-03-096-6/+6
|\ \ \ \ | | | | | | | | | | extend the excluders to containerized deployment
| * | | | extend the excluders to containerized deploymentJan Chaloupka2017-03-096-6/+6
|/ / / /
* | | | Merge pull request #3604 from sdodson/issue3603Scott Dodson2017-03-081-0/+1
|\ \ \ \ | | | | | | | | | | openshift_excluders depends on openshift_repos
| * | | | openshift_excluders depends on openshift_reposScott Dodson2017-03-081-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | So that centos repos are provisioned before attempting to install the excluders
* | | | Merge pull request #3601 from mmckinst/etcd_versionOpenShift Bot2017-03-085-3/+7
|\ \ \ \ | |/ / / |/| | | Merged by openshift-bot
| * | | add ability to specify an etcd versionMark McKinstry2017-03-085-3/+7
| | | |
* | | | Merge pull request #3589 from brenton/masterScott Dodson2017-03-082-0/+142
|\ \ \ \ | | | | | | | | | | Adding scripts for building and pushing images
| * | | | Adding scripts for building and pushing imagesBrenton Leanhardt2017-03-072-0/+142
| | | | | | | | | | | | | | | | | | | | | | | | | These scripts follow the same pattern as the origin and origin-metrics repo. From there the Jenkins job will be very simple.
* | | | | Merge pull request #3597 from ingvagabund/enable-excluders-by-defaultScott Dodson2017-03-082-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | | enable excluders by default
| * | | | enable excluders by defaultJan Chaloupka2017-03-082-2/+4
|/ / / /
* | | | 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
| | | | |