Merge pull request kubernetes#643 from keontang/aliyun-pd

enable controller attach detach for aliyun persistent disk
mqliang · Feb 7, 2017 · e628af5 · e628af5
2 parents 5fa74e3 + 888a9a5
commit e628af5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/cluster/caicloud-ansible/roles/master/templates/kubelet.j2 b/cluster/caicloud-ansible/roles/master/templates/kubelet.j2
@@ -27,6 +27,9 @@ KUBELET_API_SERVER="--api-servers=http://localhost:{{ kube_master_insecure_port
 {% if networking == "calico" -%}
 {{ kubelet_options.append('--network-plugin-dir=/etc/cni/net.d')|default('', true) -}}
 {% endif -%}
+{% if host_provider == "aliyun" or host_provider == "anchnet" -%}
+{{ kubelet_options.append('--enable-controller-attach-detach=true')|default('', true) -}}
+{% endif -%}
 
 # Add your own!
 KUBELET_ARGS="--register-schedulable=false --config={{ kube_manifest_dir }} --pod-infra-container-image={{ pod_infra_container_image }} --node-ip={{ hostvars[inventory_hostname]['internal_ip'] }} {{ kubelet_options|join(' ') }}"
diff --git a/cluster/caicloud-ansible/roles/node/templates/kubelet.j2 b/cluster/caicloud-ansible/roles/node/templates/kubelet.j2
@@ -27,5 +27,8 @@ KUBELET_API_SERVER="--api-servers=https://{{ hostvars[groups['masters'][0]]['int
 {% if networking == "calico" -%}
 {{ kubelet_options.append('--network-plugin-dir=/etc/cni/net.d')|default('', true) -}}
 {% endif -%}
+{% if host_provider == "aliyun" or host_provider == "anchnet" -%}
+{{ kubelet_options.append('--enable-controller-attach-detach=true')|default('', true) -}}
+{% endif -%}
 
 KUBELET_ARGS="--kubeconfig={{ kube_config_dir }}/kubelet.kubeconfig --config={{ kube_manifest_dir }} --pod-infra-container-image={{ pod_infra_container_image }} --node-ip={{ hostvars[inventory_hostname]['internal_ip'] }} {{ kubelet_options|join(' ') }}"