Bug 1689149 - adding secret names to SA for whitelisting

openshift · Mar 15, 2019 · 1f86f2e · 1f86f2e
1 parent c2a3f89
commit 1f86f2e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/roles/openshift_logging_curator/tasks/main.yaml b/roles/openshift_logging_curator/tasks/main.yaml
@@ -33,13 +33,17 @@
     name: "aggregated-logging-curator"
     namespace: "{{ openshift_logging_namespace }}"
     image_pull_secrets: "{{ openshift_logging_curator_image_pull_secret }}"
+    secrets:
+    - logging-curator
   when: openshift_logging_curator_image_pull_secret != ''
 
 - name: Create Curator service account
   oc_serviceaccount:
     state: present
     name: "aggregated-logging-curator"
     namespace: "{{ openshift_logging_namespace }}"
+    secrets:
+    - logging-curator
   when:
     - openshift_logging_curator_image_pull_secret == ''
 

diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml
@@ -66,13 +66,17 @@
     name: "aggregated-logging-elasticsearch"
     namespace: "{{ openshift_logging_elasticsearch_namespace }}"
     image_pull_secrets: "{{ openshift_logging_elasticsearch_image_pull_secret }}"
+    secrets:
+    - logging-elasticsearch
   when: openshift_logging_elasticsearch_image_pull_secret != ''
 
 - name: Create ES service account
   oc_serviceaccount:
     state: present
     name: "aggregated-logging-elasticsearch"
     namespace: "{{ openshift_logging_elasticsearch_namespace }}"
+    secrets:
+    - logging-elasticsearch
   when:
   - openshift_logging_elasticsearch_image_pull_secret == ''
 

diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml
@@ -59,13 +59,17 @@
     name: "aggregated-logging-fluentd"
     namespace: "{{ openshift_logging_fluentd_namespace }}"
     image_pull_secrets: "{{ openshift_logging_fluentd_image_pull_secret }}"
+    secrets:
+    - logging-fluentd
   when: openshift_logging_fluentd_image_pull_secret != ''
 
 - name: Create Fluentd service account
   oc_serviceaccount:
     state: present
     name: "aggregated-logging-fluentd"
     namespace: "{{ openshift_logging_fluentd_namespace }}"
+    secrets:
+    - logging-fluentd
   when:
     - openshift_logging_fluentd_image_pull_secret == ''
 

diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml
@@ -44,13 +44,17 @@
     name: "aggregated-logging-kibana"
     namespace: "{{ openshift_logging_namespace }}"
     image_pull_secrets: "{{ openshift_logging_kibana_image_pull_secret }}"
+    secrets:
+    - logging-kibana
   when: openshift_logging_kibana_image_pull_secret != ''
 
 - name: Create Kibana service account
   oc_serviceaccount:
     state: present
     name: "aggregated-logging-kibana"
     namespace: "{{ openshift_logging_namespace }}"
+    secrets:
+    - logging-kibana
   when:
     - openshift_logging_kibana_image_pull_secret == ''
 

diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml
@@ -44,13 +44,17 @@
     name: "aggregated-logging-mux"
     namespace: "{{ openshift_logging_mux_namespace }}"
     image_pull_secrets: "{{ openshift_logging_mux_image_pull_secret }}"
+    secrets:
+    - logging-mux
   when: openshift_logging_mux_image_pull_secret != ''
 
 - name: Create Mux service account
   oc_serviceaccount:
     state: present
     name: "aggregated-logging-mux"
     namespace: "{{ openshift_logging_mux_namespace }}"
+    secrets:
+    - logging-mux
   when:
   - openshift_logging_mux_image_pull_secret == ''