Add an nginx docker image for use on the master.

cluster/saltbase/salt/nginx/init.sls

@@ -28,6 +28,30 @@ nginx:
     - group: root
     - mode: 644
 
+{% if grains.cloud in ['gce'] %}
+/etc/kubernetes/manifests/nginx.json:
+  file:
+    - managed
+    - source: salt://nginx/nginx.json
+    - user: root
+    - group: root
+    - mode: 644
+    - require:
+      - file: /etc/nginx/nginx.conf
+      - file: /etc/nginx/sites-enabled/default
+      - file: /usr/share/nginx/htpasswd
+      - cmd: kubernetes-cert      
+
+
+#stop legacy nginx_service 
+stop_nginx-service:
+  service.dead:
+    - name: nginx
+    - enable: None
+    - watch:
+      - file: /etc/kubernetes/manifests/nginx.json
+
+{% else %}
 nginx-service:
   service:
     - running
@@ -38,3 +62,5 @@ nginx-service:
       - file: /etc/nginx/sites-enabled/default
       - file: /usr/share/nginx/htpasswd
       - cmd: kubernetes-cert
+{% endif %}
+