Browse Source
Merge pull request #3178 from gitphill/patch-1
Add azure-container-registry-config for Azure
pull/3172/head
k8s-ci-robot
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
1 deletions
-
roles/kubernetes/node/templates/kubelet.standard.env.j2
|
|
@ -121,8 +121,10 @@ KUBELET_VOLUME_PLUGIN="--volume-plugin-dir={{ kubelet_flexvolumes_plugins_dir }} |
|
|
|
|
|
|
|
|
# Should this cluster be allowed to run privileged docker containers |
|
|
# Should this cluster be allowed to run privileged docker containers |
|
|
KUBE_ALLOW_PRIV="--allow-privileged=true" |
|
|
KUBE_ALLOW_PRIV="--allow-privileged=true" |
|
|
{% if cloud_provider is defined and cloud_provider in ["openstack", "azure", "vsphere"] %} |
|
|
|
|
|
|
|
|
{% if cloud_provider is defined and cloud_provider in ["openstack", "vsphere"] %} |
|
|
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud_config" |
|
|
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud_config" |
|
|
|
|
|
{% elif cloud_provider is defined and cloud_provider in ["azure"] %} |
|
|
|
|
|
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud_config --azure-container-registry-config={{ kube_config_dir }}/cloud_config" |
|
|
{% elif cloud_provider is defined and cloud_provider in ["aws", "external"] %} |
|
|
{% elif cloud_provider is defined and cloud_provider in ["aws", "external"] %} |
|
|
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}" |
|
|
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }}" |
|
|
{% elif cloud_provider is defined and cloud_provider == "oci" %} |
|
|
{% elif cloud_provider is defined and cloud_provider == "oci" %} |
|
|
|
