summaryrefslogtreecommitdiffstats
path: root/roles/flannel/tasks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-05 03:45:06 -0700
committerGitHub <noreply@github.com>2017-10-05 03:45:06 -0700
commitcdbc995e65921210981e9fb3710a36c7d93a35dc (patch)
tree7475e2b3302da859fe60513f7c535c912aab6f0b /roles/flannel/tasks
parent6efc786c94afa7eb9270b92d3d7022f190a3de48 (diff)
parentf4c7d5e064fad263f618fb633d5c0d37c0a2a553 (diff)
downloadopenshift-cdbc995e65921210981e9fb3710a36c7d93a35dc.tar.gz
openshift-cdbc995e65921210981e9fb3710a36c7d93a35dc.tar.bz2
openshift-cdbc995e65921210981e9fb3710a36c7d93a35dc.tar.xz
openshift-cdbc995e65921210981e9fb3710a36c7d93a35dc.zip
Merge pull request #5637 from wozniakjan/1496271_fix
Automatic merge from submit-queue. Bug 1496271 - Perserve SCC for ES local persistent storage ES can be modified to use node local persistent storage. This requires changing SCC and is described in docs: https://docs.openshift.com/container-platform/3.6/install_config/aggregate_logging.html During an upgrade, SCC defined by the user is ignored. This fix fetches SCC user defined as a fact and adds it to the ES DC which is later used. Also includes cherrypicked fix for - Bug 1482661 - Preserve ES dc nodeSelector and supplementalGroups cc @jcantrill
Diffstat (limited to 'roles/flannel/tasks')
0 files changed, 0 insertions, 0 deletions