From 2f5ba28a17cb2ff3fcca0173cdae06a8de27b52b Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@google.com>
Date: Mon, 11 May 2015 13:59:58 -0700
Subject: [PATCH] Switch Fluentd to ES manifest back to YAML

---
 .../saltbase/salt/fluentd-es/fluentd-es.json  | 30 -------------------
 .../saltbase/salt/fluentd-es/fluentd-es.yaml  | 29 ++++++++++++++++++
 cluster/saltbase/salt/fluentd-es/init.sls     |  4 +--
 3 files changed, 31 insertions(+), 32 deletions(-)
 delete mode 100644 cluster/saltbase/salt/fluentd-es/fluentd-es.json
 create mode 100644 cluster/saltbase/salt/fluentd-es/fluentd-es.yaml

diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.json b/cluster/saltbase/salt/fluentd-es/fluentd-es.json
deleted file mode 100644
index 1d6fa4ac43b..00000000000
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "apiVersion": "v1beta3",
- "kind": "Pod",
- "metadata": {"name": "fluentd-elasticsearch"},
- "spec": {
-   "containers": [
-     { "name": "fluentd-elasticsearch",
-       "image": "gcr.io/google_containers/fluentd-elasticsearch:1.5",
-       "env": [
-         { "name": "FLUENTD_ARGS",
-           "value": "-qq"}
-       ],
-       "volumeMounts": [
-         { "name": "varlog",
-            "mountPath": "/varlog"},
-          { "name": "containers",
-            "mountPath": "/var/lib/docker/containers"}
-       ]
-     }
-   ],
- "volumes": [
-   { "name": "varlog",
-     "hostPath": { "path": "/var/log"}
-   },
-   { "name": "containers",
-     "hostPath": { "path": "/var/lib/docker/containers"}
-   }
- ]
- }
-}
diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
new file mode 100644
index 00000000000..706c1bc0ae0
--- /dev/null
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -0,0 +1,29 @@
+apiVersion: v1beta3
+kind: Pod
+metadata:
+  name: fluentd-elasticsearch
+spec:
+  containers:
+  - name: fluentd-elasticsearch
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.5
+    env:
+    - name: "FLUENTD_ARGS"
+      value: "-qq"
+    volumeMounts:
+    - name: varlog
+      mountPath: /varlog
+    - name: containers
+      mountPath: /var/lib/docker/containers
+    - name: token-admin
+      mountPath: /etc/token-admin
+      readOnly: true
+  volumes:
+  - name: varlog
+    hostPath:
+      path: /var/log
+  - name: containers
+    hostPath:
+      path: /var/lib/docker/containers
+  - name: token-admin
+    secret:
+    secretName: token-admin
diff --git a/cluster/saltbase/salt/fluentd-es/init.sls b/cluster/saltbase/salt/fluentd-es/init.sls
index e082af627e7..90f19c374b9 100644
--- a/cluster/saltbase/salt/fluentd-es/init.sls
+++ b/cluster/saltbase/salt/fluentd-es/init.sls
@@ -1,6 +1,6 @@
-/etc/kubernetes/manifests/fluentd-es.json:
+/etc/kubernetes/manifests/fluentd-es.yaml:
   file.managed:
-    - source: salt://fluentd-es/fluentd-es.json
+    - source: salt://fluentd-es/fluentd-es.yaml
     - user: root
     - group: root
     - mode: 644