diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-06 07:41:01 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-06 07:41:01 -0800 |
commit | a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79 (patch) | |
tree | 9b26625bed554866dcc6ff1e5f5a72b872c6ff4a /roles/calico_master/meta | |
parent | d512d781be3530997522fb38ba29ee7f33eae5c8 (diff) | |
parent | 1a4b2205ae100ca7d7947e18e94c93d690ad9db7 (diff) | |
download | openshift-a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79.tar.gz openshift-a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79.tar.bz2 openshift-a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79.tar.xz openshift-a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79.zip |
Merge pull request #7016 from kwoodson/daemonset_monitoring
Automatic merge from submit-queue.
daemonset config modifications to allow monitoring.
Modifications that allow custom secrets, configmaps, and shared setup between containers for config and monitoring.
Diffstat (limited to 'roles/calico_master/meta')
0 files changed, 0 insertions, 0 deletions