Merge pull request #10942 from brendandburns/automated-cherry-pick-of-#10877-on-release-0.21

Automated cherry pick of #10877 on release 0.21

cluster/aws/templates/create-dynamic-salt-files.sh

@@ -81,6 +81,27 @@ contexts:
 current-context: service-account-context
 EOF
 
+mkdir -p /srv/salt-overlay/salt/kubelet
+kubelet_kubeconfig_file="/srv/salt-overlay/salt/kubelet/kubeconfig"
+cat > "${kubelet_kubeconfig_file}" <<EOF
+apiVersion: v1
+kind: Config
+users:
+- name: kubelet
+  user:
+    token: ${kubelet_token}
+clusters:
+- name: local
+  cluster:
+     insecure-skip-tls-verify: true
+contexts:
+- context:
+    cluster: local
+    user: kubelet
+  name: service-account-context
+current-context: service-account-context
+EOF
+
 # Generate tokens for other "service accounts".  Append to known_tokens.
 #
 # NB: If this list ever changes, this script actually has to

cluster/saltbase/salt/docker/init.sls

@@ -114,11 +114,19 @@ lxc-docker-{{ override_docker_ver }}:
       - lxc-docker-{{ override_docker_ver }}: /var/cache/docker-install/{{ override_deb }}
     - require:
       - file: /var/cache/docker-install/{{ override_deb }}
-{% endif %}
+{% endif %} # end override_docker_ver != ''
 
 docker:
   service.running:
+# Starting Docker is racy on aws for some reason.  To be honest, since Monit
+# is managing Docker restart we should probably just delete this whole thing
+# but the kubernetes components use salt 'require' to set up a dag, and that
+# complicated and scary to unwind.
+{% if grains.cloud is defined and grains.cloud == 'aws' %}
+    - enable: False
+{% else %}
     - enable: True
+{% endif %}
     - watch:
       - file: {{ environment_file }}
 {% if override_docker_ver != '' %}
@@ -126,4 +134,4 @@ docker:
       - pkg: lxc-docker-{{ override_docker_ver }}
 {% endif %}
 
-{% endif %}
+{% endif %} # end grains.os_family != 'RedHat'