From 2e1598117fe896033a3f290820c8e8dfbc42bd81 Mon Sep 17 00:00:00 2001
From: Eric Wolinetz <ewolinet@redhat.com>
Date: Mon, 5 Feb 2018 13:50:33 -0600
Subject: Swapping container order for es pod

---
 .../templates/2.x/es.j2                            | 74 +++++++++++-----------
 .../templates/5.x/es.j2                            | 72 ++++++++++-----------
 2 files changed, 73 insertions(+), 73 deletions(-)

(limited to 'roles/openshift_logging_elasticsearch')

diff --git a/roles/openshift_logging_elasticsearch/templates/2.x/es.j2 b/roles/openshift_logging_elasticsearch/templates/2.x/es.j2
index b1d6a4489..e3315adc8 100644
--- a/roles/openshift_logging_elasticsearch/templates/2.x/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/2.x/es.j2
@@ -41,43 +41,7 @@ spec:
 {% endfor %}
 {% endif %}
       containers:
-        - name: proxy
-          image: {{ proxy_image }}
-          imagePullPolicy: IfNotPresent
-          args:
-           - --upstream-ca=/etc/elasticsearch/secret/admin-ca
-           - --https-address=:4443
-           - -provider=openshift
-           - -client-id={{openshift_logging_elasticsearch_prometheus_sa}}
-           - -client-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token
-           - -cookie-secret={{ 16 | lib_utils_oo_random_word | b64encode }}
-           - -basic-auth-password={{ basic_auth_passwd }}
-           - -upstream=https://localhost:9200
-           - '-openshift-sar={"namespace": "{{ openshift_logging_elasticsearch_namespace}}", "verb": "view", "resource": "prometheus", "group": "metrics.openshift.io"}'
-           - '-openshift-delegate-urls={"/": {"resource": "prometheus", "verb": "view", "group": "metrics.openshift.io", "namespace": "{{ openshift_logging_elasticsearch_namespace}}"}}'
-           - --tls-cert=/etc/tls/private/tls.crt
-           - --tls-key=/etc/tls/private/tls.key
-           - -pass-access-token
-           - -pass-user-headers
-          ports:
-          - containerPort: 4443
-            name: proxy
-            protocol: TCP
-          volumeMounts:
-          - mountPath: /etc/tls/private
-            name: proxy-tls
-            readOnly: true
-          - mountPath: /etc/elasticsearch/secret
-            name: elasticsearch
-            readOnly: true
-          resources:
-            limits:
-              memory: "{{openshift_logging_elasticsearch_proxy_memory_limit }}"
-            requests:
-              cpu: "{{openshift_logging_elasticsearch_proxy_cpu_request }}"
-              memory: "{{openshift_logging_elasticsearch_proxy_memory_limit }}"
-        -
-          name: "elasticsearch"
+        - name: "elasticsearch"
           image: {{image}}
           imagePullPolicy: IfNotPresent
           resources:
@@ -165,6 +129,42 @@ spec:
             initialDelaySeconds: 10
             timeoutSeconds: 30
             periodSeconds: 5
+        -
+          name: proxy
+          image: {{ proxy_image }}
+          imagePullPolicy: IfNotPresent
+          args:
+           - --upstream-ca=/etc/elasticsearch/secret/admin-ca
+           - --https-address=:4443
+           - -provider=openshift
+           - -client-id={{openshift_logging_elasticsearch_prometheus_sa}}
+           - -client-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token
+           - -cookie-secret={{ 16 | lib_utils_oo_random_word | b64encode }}
+           - -basic-auth-password={{ basic_auth_passwd }}
+           - -upstream=https://localhost:9200
+           - '-openshift-sar={"namespace": "{{ openshift_logging_elasticsearch_namespace}}", "verb": "view", "resource": "prometheus", "group": "metrics.openshift.io"}'
+           - '-openshift-delegate-urls={"/": {"resource": "prometheus", "verb": "view", "group": "metrics.openshift.io", "namespace": "{{ openshift_logging_elasticsearch_namespace}}"}}'
+           - --tls-cert=/etc/tls/private/tls.crt
+           - --tls-key=/etc/tls/private/tls.key
+           - -pass-access-token
+           - -pass-user-headers
+          ports:
+          - containerPort: 4443
+            name: proxy
+            protocol: TCP
+          volumeMounts:
+          - mountPath: /etc/tls/private
+            name: proxy-tls
+            readOnly: true
+          - mountPath: /etc/elasticsearch/secret
+            name: elasticsearch
+            readOnly: true
+          resources:
+            limits:
+              memory: "{{openshift_logging_elasticsearch_proxy_memory_limit }}"
+            requests:
+              cpu: "{{openshift_logging_elasticsearch_proxy_cpu_request }}"
+              memory: "{{openshift_logging_elasticsearch_proxy_memory_limit }}"
       volumes:
         - name: proxy-tls
           secret:
diff --git a/roles/openshift_logging_elasticsearch/templates/5.x/es.j2 b/roles/openshift_logging_elasticsearch/templates/5.x/es.j2
index bcfd6f273..8685b7849 100644
--- a/roles/openshift_logging_elasticsearch/templates/5.x/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/5.x/es.j2
@@ -41,42 +41,7 @@ spec:
 {% endfor %}
 {% endif %}
       containers:
-        - name: proxy
-          image: {{ proxy_image }}
-          imagePullPolicy: IfNotPresent
-          args:
-           - --upstream-ca=/etc/elasticsearch/secret/admin-ca
-           - --https-address=:4443
-           - -provider=openshift
-           - -client-id={{openshift_logging_elasticsearch_prometheus_sa}}
-           - -client-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token
-           - -cookie-secret={{ 16 | lib_utils_oo_random_word | b64encode }}
-           - -upstream=https://localhost:9200
-           - '-openshift-sar={"namespace": "{{ openshift_logging_elasticsearch_namespace}}", "verb": "view", "resource": "prometheus", "group": "metrics.openshift.io"}'
-           - '-openshift-delegate-urls={"/": {"resource": "prometheus", "verb": "view", "group": "metrics.openshift.io", "namespace": "{{ openshift_logging_elasticsearch_namespace}}"}}'
-           - --tls-cert=/etc/tls/private/tls.crt
-           - --tls-key=/etc/tls/private/tls.key
-           - -pass-access-token
-           - -pass-user-headers
-          ports:
-          - containerPort: 4443
-            name: proxy
-            protocol: TCP
-          volumeMounts:
-          - mountPath: /etc/tls/private
-            name: proxy-tls
-            readOnly: true
-          - mountPath: /etc/elasticsearch/secret
-            name: elasticsearch
-            readOnly: true
-          resources:
-            limits:
-              memory: "{{openshift_logging_elasticsearch_proxy_memory_limit }}"
-            requests:
-              cpu: "{{openshift_logging_elasticsearch_proxy_cpu_request }}"
-              memory: "{{openshift_logging_elasticsearch_proxy_memory_limit }}"
-        -
-          name: "elasticsearch"
+        - name: "elasticsearch"
           image: {{image}}
           imagePullPolicy: IfNotPresent
           resources:
@@ -172,6 +137,41 @@ spec:
             initialDelaySeconds: 10
             timeoutSeconds: 30
             periodSeconds: 5
+        - 
+          name: proxy
+          image: {{ proxy_image }}
+          imagePullPolicy: IfNotPresent
+          args:
+           - --upstream-ca=/etc/elasticsearch/secret/admin-ca
+           - --https-address=:4443
+           - -provider=openshift
+           - -client-id={{openshift_logging_elasticsearch_prometheus_sa}}
+           - -client-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token
+           - -cookie-secret={{ 16 | lib_utils_oo_random_word | b64encode }}
+           - -upstream=https://localhost:9200
+           - '-openshift-sar={"namespace": "{{ openshift_logging_elasticsearch_namespace}}", "verb": "view", "resource": "prometheus", "group": "metrics.openshift.io"}'
+           - '-openshift-delegate-urls={"/": {"resource": "prometheus", "verb": "view", "group": "metrics.openshift.io", "namespace": "{{ openshift_logging_elasticsearch_namespace}}"}}'
+           - --tls-cert=/etc/tls/private/tls.crt
+           - --tls-key=/etc/tls/private/tls.key
+           - -pass-access-token
+           - -pass-user-headers
+          ports:
+          - containerPort: 4443
+            name: proxy
+            protocol: TCP
+          volumeMounts:
+          - mountPath: /etc/tls/private
+            name: proxy-tls
+            readOnly: true
+          - mountPath: /etc/elasticsearch/secret
+            name: elasticsearch
+            readOnly: true
+          resources:
+            limits:
+              memory: "{{openshift_logging_elasticsearch_proxy_memory_limit }}"
+            requests:
+              cpu: "{{openshift_logging_elasticsearch_proxy_cpu_request }}"
+              memory: "{{openshift_logging_elasticsearch_proxy_memory_limit }}"
       volumes:
         - name: proxy-tls
           secret:
-- 
cgit v1.2.1