summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5856 from sngchlko/fix-typo-in-kuryrMichael Gugino2017-10-261-3/+3
|\ | | | | Fix typo and add detailed comments in kuryr
| * Fix typo and add detailed comments in kuryrSeungcheol Ko2017-10-241-3/+3
| |
* | Merge pull request #5863 from mgugino-upstream-stage/fix-logging-loop-warningsOpenShift Merge Robot2017-10-261-12/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix loop_var warnings during logging install Currently, install_logging.yml in openshift_logging role loops over other roles. This creates a collision with the keyword 'item' in those roles. This commit adds the loop_var as suggested by ansible warnings.
| * | Fix loop_var warnings during logging installMichael Gugino2017-10-241-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, install_logging.yml in openshift_logging role loops over other roles. This creates a collision with the keyword 'item' in those roles. This commit adds the loop_var as suggested by ansible warnings.
* | | Automatic commit of package [openshift-ansible] release [3.7.0-0.179.0].Jenkins CD Merge Bot2017-10-262-2/+14
| | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | Merge pull request #5655 from giuseppe/etcd-additional-bind-mountOpenShift Merge Robot2017-10-259-76/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. etcd: remove hacks for the system container This removes the special handling of the etcd directories when running as a system container. Marked as WIP as it depends from this [change](https://bugzilla.redhat.com/show_bug.cgi?id=1484326) in the etcd image to be reflected into `registry.access.redhat.com/rhel7/etcd`
| * | | etcd: remove hacks for the system containerGiuseppe Scrivano2017-10-239-76/+33
| | | | | | | | | | | | | | | | | | | | | | | | Use ADDTL_MOUNTS to add a bind mount to the etcd configuration. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #5830 from abutcher/registry-deploymentOpenShift Merge Robot2017-10-252-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure deployment_subtype is set within openshift_sanitize_inventory. https://bugzilla.redhat.com/show_bug.cgi?id=1504021
| * | | | Ensure deployment_subtype is set within openshift_sanitize_inventory.Andrew Butcher2017-10-202-2/+2
| | | | |
* | | | | Merge pull request #5861 from mtnbikenc/fix-1505537Scott Dodson2017-10-251-27/+3
|\ \ \ \ \ | | | | | | | | | | | | 1505537 Remove pause from master service startup
| * | | | | Remove pause from master service startupRussell Teague2017-10-251-27/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes 1505537 https://bugzilla.redhat.com/show_bug.cgi?id=1505537
* | | | | | Merge pull request #5850 from mgugino-upstream-stage/remove-base-packageScott Dodson2017-10-258-27/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove base package install
| * | | | | | Remove base package installMichael Gugino2017-10-238-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, base atomic-openshift package is installed for versioning. This doesn't appear to be necessary. This commit removes this step. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1504196
* | | | | | | Merge pull request #5573 from vshn/registryclaim1OpenShift Merge Robot2017-10-251-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Remove unused registry_volume_claim variable The "registry_volume_claim" variable has not been used since at least commit 7cf5cc1 (February 21, 2017) and this commit removes the last mention.
| * | | | | | | Remove unused registry_volume_claim variableMichael Hanselmann2017-10-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "registry_volume_claim" variable has not been used since at least commit 7cf5cc1 (February 21, 2017) and this commit removes the last mention.
* | | | | | | | Merge pull request #5854 from sdodson/image-stream-syncScott Dodson2017-10-2567-215/+14386
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Sync latest imagestreams and templates
| * | | | | | | | Sync latest imagestreams and templatesScott Dodson2017-10-2367-215/+14386
| | | | | | | | |
* | | | | | | | | Merge pull request #5810 from zgalor/refactor-prom-entryOpenShift Merge Robot2017-10-252-0/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Add installer checkpoint for prometheus
| * | | | | | | | | Add installer checkpoint for prometheusZohar Galor2017-10-192-0/+27
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add checkpoint steps for full cluster install and individual entry point playbook.
* | | | | | | | | Merge pull request #5848 from zgalor/pvc_default_alignScott Dodson2017-10-254-4/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Change default in prometheus storage type to emptydir
| * | | | | | | | | Change default in prometheus storage type to emptydirZohar Galor2017-10-244-4/+16
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only create pvcs when openshift_prometheus_<alertmanager|buffer>_storage_type==pvc By default deployment will use emptydir. Add some documentation and examples. bz: https://bugzilla.redhat.com/show_bug.cgi?id=1495446
* | | | | | | | | Merge pull request #5857 from wozniakjan/bz_1491636/logging/nodeselectorOpenShift Merge Robot2017-10-251-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1491636 - honor node selectors The deprecation of `*_hosted_*` vars made logging node selectors set in the inventory to be ignored. Node selectors were set as 'facts' and they have higher priority than inventory variables. Setting logging node selectors could be achieved only by using command line --extra-vars. It is related to the same BZ as https://github.com/openshift/openshift-ansible/pull/5858 but the issue is different.
| * | | | | | | | | Bug 1491636 - honor node selectorsJan Wozniak2017-10-241-6/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deprecation of `*_hosted_*` vars made logging node selectors set in the inventory to be ignored. Node selectors were set as 'facts' and they have higher priority than inventory variables. Setting logging node selectors could be achieved only by using command line --extra-vars.
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.178.0].Jenkins CD Merge Bot2017-10-252-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | Merge pull request #5787 from zgalor/image_prefixOpenShift Merge Robot2017-10-243-11/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Split prometheus image defaults to prefix and version To allow easier testing and deployment from different repos, image defaults were split to prefix and version that can be set externally. bz: https://bugzilla.redhat.com/show_bug.cgi?id=1493431
| * | | | | | | | | Split prometheus image defaults to prefix and versionZohar Galor2017-10-243-11/+17
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow easier testing and deployment from different repos, image defaults were split to prefix and version that can be set externally. bz: https://bugzilla.redhat.com/show_bug.cgi?id=1493431
* | | | | | | | | Merge pull request #5780 from ↵OpenShift Merge Robot2017-10-241-2/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | smarterclayton/allow_per_node_group_bootstrap_and_image Automatic merge from submit-queue. Handle bootstrap behavior in GCP template Allow each node group to request bootstrap, allow per node group image override, and ensure the provision logic does not wait for bootstrapping node groups before continuing. This is an incremental step to allow GCP clusters to use bootstrap logic on cluster deploy without having fully baked images. We will switch over slowly and ensure both code paths function. Then we can remove this as necessary. For metadata, we set the cluster id and bootstrap state into instance metadata. On GCP, we'll use project metadata to set the bootstrap kubeconfig file and a startup-script to call it (not in a PR yet). Pairs with openshift/origin-gce#54 @kwoodson
| * | | | | | | | | Handle bootstrap behavior in GCP templateClayton Coleman2017-10-181-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow each node group to request bootstrap, allow per node group image override, and ensure the provision logic does not wait for bootstrapping node groups before continuing. This is an incremental step to allow GCP clusters to use bootstrap logic on cluster deploy without having fully baked images. We will switch over slowly and ensure both code paths function.
* | | | | | | | | | Merge pull request #5700 from wozniakjan/bz_1452939OpenShift Merge Robot2017-10-2414-14/+164
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Bug 1452939 - change imagePullPolicy in logging and metrics cc: @jcantrill
| * | | | | | | | | | Bug 1452939 - change Logging & Metrics imagePullPolicyJan Wozniak2017-10-2314-14/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - all images logging and metrics change their default imagePullPolicy from Always to IfNotPresent
* | | | | | | | | | | Merge pull request #5806 from staebler/service_catalog_uninstall_issuesOpenShift Merge Robot2017-10-247-17/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix a few small issues in service catalog uninstall * Service catalog install was not re-creating the apiserver.crt and apiserver.key files when generating certs. But the ca.crt and ca.key files were being re-created. This was causing non-verifiable certs to be used when service catalog was uninstalled and re-installed. The service catalog installer was changed to delete the apiserver.crt and apiserver.key files so that they are re-created using the new ca.crt and ca.key files. * The asb auth token secret was not being deleted correctly and causing the uninstaller to fail. * The asb uninstaller was attempting to delete the broker registration from the service catalog. However, the service catalog is uninstalled first. When the asb uninstaller would fail when attempting to delete the ClusterServiceBroker. The uninstaller was changed to verify that the servicecatalog APIService exists first before attempting to delete the ClusterServiceBroker. * The service catalog uninstaller was attempting to delete policybindings. The server does not have a resource type name policybinding. I do not know what the intention is there, but I have commented out that part of the uninstaller.
| * | | | | | | | | | | Remove extraneous spaces that yamllint dislikesstaebler2017-10-231-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Remove role bindings during service catalog un-installstaebler2017-10-225-15/+28
| | | | | | | | | | | |
| * | | | | | | | | | | Fix a few small issues in service catalog uninstallstaebler2017-10-223-6/+23
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgradesOpenShift Merge Robot2017-10-243-11/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Enable oreg_auth credential replace during upgrades Currently, upgrades run a docker image pull prior to upgrading masters and nodes for containerized installs. If using a secure registry, and a user wishes to upgrade their credentials due to expiry, the image pull will fail. This commit ensures docker login credentials are updated during upgrades, if necessary. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503995
| * | | | | | | | | | | | Enable oreg_auth credential replace during upgradesMichael Gugino2017-10-193-11/+19
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, upgrades run a docker image pull prior to upgrading masters and nodes for containerized installs. If using a secure registry, and a user wishes to upgrade their credentials due to expiry, the image pull will fail. This commit ensures docker login credentials are updated during upgrades, if necessary. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503995
* | | | | | | | | | | | Merge pull request #5828 from mgugino-upstream-stage/fix-openid-challengeScott Dodson2017-10-241-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Remove incorrect validation for OpenIDIdentityProvider
| * | | | | | | | | | | Remove incorrect validation for OpenIDIdentityProviderMichael Gugino2017-10-201-1/+0
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, OpenIDIdentityProvider does not support 'challenge=true' in openshift-ansible. This is incorrect, the auth plugin OpenIDIdentityProvider does support this. This commit removes the unnecessary validation of challenge key. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1444367 Fixes: https://github.com/openshift/openshift-ansible/issues/4417
* | | | | | | | | | | Merge pull request #5840 from staebler/service_catalog_role_patchingOpenShift Merge Robot2017-10-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Fix edit and admin role patching for service catalog Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1496694. Update the jinja files used to patch the edit and admin ClusterRoles so that it uses the new resource names of ServiceInstances and ServiceBindings.
| * | | | | | | | | | Fix edit and admin role patching for service catalogstaebler2017-10-231-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5838 from ↵Jan Chaloupka2017-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/strip-dash-when-comparing-versions-python3 strip dash when comparing version with Python3
| * | | | | | | | | | strip dash when comparing version with Python3Jan Chaloupka2017-10-231-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5796 from mgugino-upstream-stage/journald-masters-upgradesOpenShift Merge Robot2017-10-243-22/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic merge from submit-queue. Ensure upgrades apply latest journald settings Currently, existing clusters might not have journald configurations applied. This may result in a rate- limiting of important log messages on openshift-masters. This commit ensures that journald settings are applied during the upgrade process openshif-masters. Fixes: https://github.com/openshift/openshift-ansible/issues/5642
| * | | | | | | | | Ensure upgrades apply latest journald settingsMichael Gugino2017-10-183-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, existing clusters might not have journald configurations applied. This may result in a rate- limiting of important log messages on openshift-masters. This commit ensures that journald settings are applied during the upgrade process openshif-masters. Fixes: https://github.com/openshift/openshift-ansible/issues/5642
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.177.0].Jenkins CD Merge Bot2017-10-242-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --debug --accept-auto-changelog --keep-version --debug
* | | | | | | | | | Merge pull request #5808 from zgalor/stateful_setScott Dodson2017-10-234-14/+18
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Switch to stateful set in prometheus
| * | | | | | | | | Switch to stateful set in prometheusZohar Galor2017-10-234-14/+18
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Also update prometheus and alert-buffer image versions, and add prometheus, and oauth-proxy arguments to align with origin template
* | | | | | | | | Merge pull request #5569 from ganhuang/all-hosts-no-proxyScott Dodson2017-10-231-1/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Generate internal hostnames of no_proxy
| * | | | | | | | | Generate all internal hostnames of no_proxyGan Huang2017-10-191-1/+13
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5832 from sdodson/bz1504525Scott Dodson2017-10-232-6/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Correct version gates on policy reconciliation and add retries