Revert "Fix the race between configuring cbr0 and restarting static pods"

cluster/saltbase/salt/kube-master-addons/init.sls

@@ -37,26 +37,10 @@ master-docker-image-tags:
   file.touch:
     - name: /srv/pillar/docker-images.sls
 
-# Current containervm image by default has both docker and kubelet
-# running. But during cluster creation stage, docker and kubelet
-# could be overwritten completely, or restarted due to flag changes.
-# The ordering of salt states for service docker, kubelet and
-# master-addon below is very important to avoid the race between
-# salt restart docker or kubelet and kubelet start master components.
-# Without the ordering of salt states, when gce instance boot up,
-# configure-vm.sh will run and download the release. At the end of
-# boot, run-salt will run kube-master-addons service which installs
-# master component manifest files to kubelet config directory before
-# the installation of proper version kubelet. Please see
-# https://github.com/GoogleCloudPlatform/kubernetes/issues/10122#issuecomment-114566063
-# for detail explanation on this very issue.
 kube-master-addons:
   service.running:
     - enable: True
     - restart: True
-    - require:
-      - service: docker
-      - service: kubelet
     - watch:
       - file: master-docker-image-tags
       - file: /etc/kubernetes/kube-master-addons.sh