diff --git a/examples/busyecho.yaml b/examples/busyecho.yaml index 94a4b080a..11126b68a 100644 --- a/examples/busyecho.yaml +++ b/examples/busyecho.yaml @@ -27,3 +27,5 @@ spec: tolerations: - key: virtual-kubelet.io/provider operator: Exists + - key: azure.com/aci + effect: NoSchedule diff --git a/examples/iis-pod.yaml b/examples/iis-pod.yaml index 4cba4165a..1d2b46ced 100644 --- a/examples/iis-pod.yaml +++ b/examples/iis-pod.yaml @@ -29,3 +29,5 @@ spec: tolerations: - key: virtual-kubelet.io/provider operator: Exists + - key: azure.com/aci + effect: NoSchedule diff --git a/examples/nanoserver.yaml b/examples/nanoserver.yaml index 830aa720a..efb74ca16 100644 --- a/examples/nanoserver.yaml +++ b/examples/nanoserver.yaml @@ -18,3 +18,5 @@ spec: tolerations: - key: virtual-kubelet.io/provider operator: Exists + - key: azure.com/aci + effect: NoSchedule diff --git a/examples/nginx-pod.yaml b/examples/nginx-pod.yaml index 9c541215e..2e92f8ca6 100644 --- a/examples/nginx-pod.yaml +++ b/examples/nginx-pod.yaml @@ -21,3 +21,5 @@ spec: tolerations: - key: virtual-kubelet.io/provider operator: Exists + - key: azure.com/aci + effect: NoSchedule diff --git a/examples/pause.yaml b/examples/pause.yaml index 6936274b4..275a22cc6 100644 --- a/examples/pause.yaml +++ b/examples/pause.yaml @@ -25,3 +25,5 @@ spec: tolerations: - key: virtual-kubelet.io/provider operator: Exists + - key: azure.com/aci + effect: NoSchedule diff --git a/vkubelet/vkubelet.go b/vkubelet/vkubelet.go index a1480702d..fb1f2731b 100644 --- a/vkubelet/vkubelet.go +++ b/vkubelet/vkubelet.go @@ -81,13 +81,16 @@ func New(nodeName, operatingSystem, namespace, kubeConfig, provider, providerCon internalIP := os.Getenv("VKUBELET_POD_IP") var defaultTaintKey string + var defaultTaintValue string if taintKey != "" { defaultTaintKey = taintKey + defaultTaintValue = "" } else { defaultTaintKey = "virtual-kubelet.io/provider" + defaultTaintValue = provider } vkTaintKey := getEnv("VKUBELET_TAINT_KEY", defaultTaintKey) - vkTaintValue := getEnv("VKUBELET_TAINT_VALUE", provider) + vkTaintValue := getEnv("VKUBELET_TAINT_VALUE", defaultTaintValue) vkTaintEffectEnv := getEnv("VKUBELET_TAINT_EFFECT", "NoSchedule") var vkTaintEffect corev1.TaintEffect switch vkTaintEffectEnv {