Merge pull request #9687 from satnam6502/fluentd-gcp

Adjust Fluentd source format for Docker files to be JSON for Cloud Lo…

cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile

@@ -3,14 +3,35 @@
 # the image to DockerHub.
 # Satnam Singh (satnam@google.com)
 
-.PHONY:	build push
+# Procedure for change:
+# 1. Bump the tag number.
+# 2. Create an image for the kubernetes user on Dockerhub and push there: make kbuild kpush
+# 3. Temporarily adjust any config files etc. that reference gcr.io/google_containers/fluentd-gcp:$(TAG)
+#    to use kubernetes/fluentd-gcp:$(TAG) instead.
+# 4. Test etc.
+# 5. Issue PR.
+# 6. When PR is approved make the gcr.io version of the image: make build push
+# 7. Revert the referendes to kubernetes/fluentd-gcp:$(TAG) to gcr.io/google_containers/fluentd-gcp:$(TAG) 
+
+.PHONY:	kbuild kpush
+
+TAG = 1.7
+
+# Rules for building the test image for deployment to Dockerhub with user kubernetes.
+
+kbuild:
+	docker build -t kubernetes/fluentd-gcp:$(TAG) .
 
 
-TAG = 1.6
+kpush:
+	docker push kubernetes/fluentd-gcp:$(TAG)
+
+
+# Rules for building the real image for deployment to gcr.io
 
 build:
 	docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .
 
+
 push:
 	gcloud preview docker push gcr.io/google_containers/fluentd-gcp:$(TAG)
-

cluster/addons/fluentd-gcp/fluentd-gcp-image/google-fluentd.conf

@@ -48,7 +48,7 @@
 
 <source>
   type tail
-  format none
+  format json
   time_key time
   path /varlog/containers/*.log
   pos_file /varlog/gcp-containers.log.pos

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

@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.6
+    image: gcr.io/google_containers/fluentd-gcp:1.7
     resources:
       limits:
         cpu: 100m