Merge pull request #7274 from satnam6502/v1beta3

Convert node level logging agents to v1beta3

cluster/saltbase/salt/fluentd-es/fluentd-es.json

@@ -0,0 +1,30 @@
+{
+ "apiVersion": "v1beta3",
+ "kind": "Pod",
+ "metadata": {"name": "fluentd-elasticsearch"},
+ "spec": {
+   "containers": [
+     { "name": "fluentd-elasticsearch",
+       "image": "gcr.io/google_containers/fluentd-elasticsearch:1.4",
+       "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"}
+   }
+ ]
+ }
+}

cluster/saltbase/salt/fluentd-es/fluentd-es.manifest

@@ -1,22 +0,0 @@
-version: v1beta2
-id: fluentd-to-elasticsearch
-containers:
-  - name: fluentd-es
-    image: gcr.io/google_containers/fluentd-elasticsearch:1.4
-    env:
-      - name: FLUENTD_ARGS
-        value: -qq
-    volumeMounts:
-      - name: containers
-        mountPath: /var/lib/docker/containers
-      - name: varlog
-        mountPath: /varlog
-volumes:
-  - name: containers
-    source:
-      hostDir:
-        path: /var/lib/docker/containers
-  - name: varlog
-    source:
-      hostDir:
-        path: /var/log

cluster/saltbase/salt/fluentd-es/init.sls

@@ -1,6 +1,6 @@
-/etc/kubernetes/manifests/fluentd-es.manifest:
+/etc/kubernetes/manifests/fluentd-es.json:
   file.managed:
-    - source: salt://fluentd-es/fluentd-es.manifest
+    - source: salt://fluentd-es/fluentd-es.json
     - user: root
     - group: root
     - mode: 644

cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.json

@@ -0,0 +1,30 @@
+{
+ "apiVersion": "v1beta3",
+ "kind": "Pod",
+ "metadata": {"name": "fluentd-cloud-logging"},
+ "spec": {
+   "containers": [
+     { "name": "fluentd-cloud-logging",
+       "image": "gcr.io/google_containers/fluentd-gcp:1.4",
+       "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"}
+   }
+ ]
+ }
+}

cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.manifest

@@ -1,19 +0,0 @@
-version: v1beta2
-id: fluentd-to-gcp
-containers:
-  - name: fluentd-gcp
-    image: gcr.io/google_containers/fluentd-gcp:1.3
-    volumeMounts:
-      - name: containers
-        mountPath: /var/lib/docker/containers
-      - name: varlog
-        mountPath: /varlog
-volumes:
-  - name: containers
-    source:
-      hostDir:
-        path: /var/lib/docker/containers
-  - name: varlog
-    source:
-      hostDir:
-        path: /var/log

cluster/saltbase/salt/fluentd-gcp/init.sls

@@ -1,6 +1,6 @@
-/etc/kubernetes/manifests/fluentd-gcp.manifest:
+/etc/kubernetes/manifests/fluentd-gcp.json:
   file.managed:
-    - source: salt://fluentd-gcp/fluentd-gcp.manifest
+    - source: salt://fluentd-gcp/fluentd-gcp.json
     - user: root
     - group: root
     - mode: 644