From e246685468363e7abe688ea7ec9e21c959645f4d Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@google.com>
Date: Mon, 11 May 2015 14:55:46 -0700
Subject: [PATCH] Convert Fluentd to Cloud Logging pod specs to YAML

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

diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.json b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.json
deleted file mode 100644
index 747fb37dbc04..000000000000
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "apiVersion": "v1beta3",
- "kind": "Pod",
- "metadata": {"name": "fluentd-cloud-logging"},
- "spec": {
-   "containers": [
-     { "name": "fluentd-cloud-logging",
-       "image": "gcr.io/google_containers/fluentd-gcp: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-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
new file mode 100644
index 000000000000..67f77cf6c04b
--- /dev/null
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -0,0 +1,29 @@
+apiVersion: v1beta3
+kind: Pod
+metadata:
+  name: fluentd-cloud-logging
+spec:
+  containers:
+  - name: fluentd-cloud-logging
+    image: gcr.io/google_containers/fluentd-gcp: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-gcp/init.sls b/cluster/saltbase/salt/fluentd-gcp/init.sls
index 976c58e73731..5d38e2a0de89 100644
--- a/cluster/saltbase/salt/fluentd-gcp/init.sls
+++ b/cluster/saltbase/salt/fluentd-gcp/init.sls
@@ -1,6 +1,6 @@
-/etc/kubernetes/manifests/fluentd-gcp.json:
+/etc/kubernetes/manifests/fluentd-gcp.yaml:
   file.managed:
-    - source: salt://fluentd-gcp/fluentd-gcp.json
+    - source: salt://fluentd-gcp/fluentd-gcp.yaml
     - user: root
     - group: root
     - mode: 644