Reverse order of containers to benefit from "Defaulting container nam…

…e to"
Yolean · Aug 1, 2017 · 1e71dc5 · 1e71dc5
1 parent f44961e
commit 1e71dc5
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 54 deletions.
diff --git a/50kafka.yml b/50kafka.yml
@@ -23,24 +23,6 @@ spec:
         - name: config
           mountPath: /etc/kafka
       containers:
-      - name: metrics
-        image: solsson/kafka-prometheus-jmx-exporter@sha256:07cdc4b446ebe8208950202b924caefadad006ea94ae92d73bef81897df4d5c7
-        command:
-        - java
-        - -Xmx64M
-        - -XX:MaxMetaspaceSize=32m
-        - -jar
-        - jmx_prometheus_httpserver.jar
-        - "5556"
-        - example_configs/kafka-prometheus-monitoring.yml
-        ports:
-        - containerPort: 5556
-        resources:
-          requests:
-            cpu: 0m
-            memory: 40Mi
-          limits:
-            memory: 100Mi
       - name: broker
         image: solsson/kafka:0.11.0.0@sha256:b27560de08d30ebf96d12e74f80afcaca503ad4ca3103e63b1fd43a2e4c976ce
         env:
@@ -76,6 +58,24 @@ spec:
           mountPath: /etc/kafka
         - name: data
           mountPath: /var/lib/kafka/data
+      - name: metrics
+        image: solsson/kafka-prometheus-jmx-exporter@sha256:07cdc4b446ebe8208950202b924caefadad006ea94ae92d73bef81897df4d5c7
+        command:
+        - java
+        - -Xmx64M
+        - -XX:MaxMetaspaceSize=32m
+        - -jar
+        - jmx_prometheus_httpserver.jar
+        - "5556"
+        - example_configs/kafka-prometheus-monitoring.yml
+        ports:
+        - containerPort: 5556
+        resources:
+          requests:
+            cpu: 0m
+            memory: 40Mi
+          limits:
+            memory: 100Mi
       volumes:
       - name: config
         configMap:

diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
@@ -26,24 +26,6 @@ spec:
         - name: data
           mountPath: /var/lib/zookeeper/data
       containers:
-      - name: metrics
-        image: solsson/kafka-prometheus-jmx-exporter@sha256:07cdc4b446ebe8208950202b924caefadad006ea94ae92d73bef81897df4d5c7
-        command:
-        - java
-        - -Xmx64M
-        - -XX:MaxMetaspaceSize=32m
-        - -jar
-        - jmx_prometheus_httpserver.jar
-        - "5556"
-        - example_configs/zookeeper.yaml
-        ports:
-        - containerPort: 5556
-        resources:
-          requests:
-            cpu: 0m
-            memory: 40Mi
-          limits:
-            memory: 100Mi
       - name: zookeeper
         image: solsson/kafka:0.11.0.0@sha256:b27560de08d30ebf96d12e74f80afcaca503ad4ca3103e63b1fd43a2e4c976ce
         env:
@@ -82,6 +64,24 @@ spec:
           mountPath: /etc/kafka
         - name: data
           mountPath: /var/lib/zookeeper/data
+      - name: metrics
+        image: solsson/kafka-prometheus-jmx-exporter@sha256:07cdc4b446ebe8208950202b924caefadad006ea94ae92d73bef81897df4d5c7
+        command:
+        - java
+        - -Xmx64M
+        - -XX:MaxMetaspaceSize=32m
+        - -jar
+        - jmx_prometheus_httpserver.jar
+        - "5556"
+        - example_configs/zookeeper.yaml
+        ports:
+        - containerPort: 5556
+        resources:
+          requests:
+            cpu: 0m
+            memory: 40Mi
+          limits:
+            memory: 100Mi
       volumes:
       - name: config
         configMap:

diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
@@ -29,24 +29,6 @@ spec:
         - name: data
           mountPath: /var/lib/zookeeper/data
       containers:
-      - name: metrics
-        image: solsson/kafka-prometheus-jmx-exporter@sha256:07cdc4b446ebe8208950202b924caefadad006ea94ae92d73bef81897df4d5c7
-        command:
-        - java
-        - -Xmx64M
-        - -XX:MaxMetaspaceSize=32m
-        - -jar
-        - jmx_prometheus_httpserver.jar
-        - "5556"
-        - example_configs/zookeeper.yaml
-        ports:
-        - containerPort: 5556
-        resources:
-          requests:
-            cpu: 0m
-            memory: 40Mi
-          limits:
-            memory: 100Mi
       - name: zookeeper
         image: solsson/kafka:0.11.0.0@sha256:b27560de08d30ebf96d12e74f80afcaca503ad4ca3103e63b1fd43a2e4c976ce
         env:
@@ -85,6 +67,24 @@ spec:
           mountPath: /etc/kafka
         - name: data
           mountPath: /var/lib/zookeeper/data
+      - name: metrics
+        image: solsson/kafka-prometheus-jmx-exporter@sha256:07cdc4b446ebe8208950202b924caefadad006ea94ae92d73bef81897df4d5c7
+        command:
+        - java
+        - -Xmx64M
+        - -XX:MaxMetaspaceSize=32m
+        - -jar
+        - jmx_prometheus_httpserver.jar
+        - "5556"
+        - example_configs/zookeeper.yaml
+        ports:
+        - containerPort: 5556
+        resources:
+          requests:
+            cpu: 0m
+            memory: 40Mi
+          limits:
+            memory: 100Mi
       volumes:
       - name: config
         configMap: