diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-08-17 16:21:58 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-09-29 09:46:23 -0400 |
| commit | ec7d1b04ef91a3d10675efe1c53a88ef100437b8 (patch) | |
| tree | 4279a63adcf5c07cb784b08d16b1eb5999328d73 /roles/openshift_logging/library | |
| parent | 615e5421137fd786a70b7f7962fe3c6ce6a19cf7 (diff) | |
| download | openshift-ec7d1b04ef91a3d10675efe1c53a88ef100437b8.tar.gz openshift-ec7d1b04ef91a3d10675efe1c53a88ef100437b8.tar.bz2 openshift-ec7d1b04ef91a3d10675efe1c53a88ef100437b8.tar.xz openshift-ec7d1b04ef91a3d10675efe1c53a88ef100437b8.zip | |
bug 1482661. Preserve ES dc nodeSelector and supplementalGroups
(cherry picked from commit 601e35cbf4410972c7fa0a1d3d5c6327b82353ac)
Diffstat (limited to 'roles/openshift_logging/library')
| -rw-r--r-- | roles/openshift_logging/library/openshift_logging_facts.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_logging/library/openshift_logging_facts.py b/roles/openshift_logging/library/openshift_logging_facts.py index 35accfb78..01c0408d8 100644 --- a/roles/openshift_logging/library/openshift_logging_facts.py +++ b/roles/openshift_logging/library/openshift_logging_facts.py @@ -171,12 +171,17 @@ class OpenshiftLoggingFacts(OCBaseCommand): if comp is not None: spec = dc_item["spec"]["template"]["spec"] facts = dict( + name=name, selector=dc_item["spec"]["selector"], replicas=dc_item["spec"]["replicas"], serviceAccount=spec["serviceAccount"], containers=dict(), volumes=dict() ) + if "nodeSelector" in spec: + facts["nodeSelector"] = spec["nodeSelector"] + if "supplementalGroups" in spec["securityContext"]: + facts["storageGroups"] = spec["securityContext"]["supplementalGroups"] if "volumes" in spec: for vol in spec["volumes"]: clone = copy.deepcopy(vol) |