Skip to content

K
k3s
Commit a50aed79 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #49017 from luxas/kubeadm_proxy_cloud_toleration

Automatic merge from submit-queue (batch tested with PRs 49017, 45440, 48384, 45894, 48808) kubeadm: Make kube-proxy tolerate the uninitialized cloud taint **What this PR does / why we need it**: This is needed in order to start the cloud-controller-manager successfully. The cloud controller manager should run as a DaemonSet with a nodeSelector for master nodes. The cloud controller manager should run on the hostNetwork to avoid the bootstrap problem when there is no CNI network yet. But the cloud controller manager needs to know how to address the master. It does this by talking to the kubernetes service (e.g. 10.96.0.1). That iptables rule must exist at the time, which now isn't the case when kube-proxy isn't running. kube-proxy isn't running due to that the kubelet is tainted with the external cloud taint. This PR makes kube-proxy tolerate the cloud taint, so that the cloud controller manager can run easily on kubeadm clusters. This was found by @prydie, thanks! **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: This should probably be a cherrypick candidate so folks can use kubeadm to easily create external cloud clusters. The change is small and isolated. cc @wojtek-t **Release note**: ```release-note kubeadm: Make kube-proxy tolerate the external cloud provider taint so that an external cloud provider can be easily used on top of kubeadm ``` cc @kubernetes/sig-cluster-lifecycle-pr-reviews @wlan0 @thockin
parents d20414e2 d0ab597b
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
cmd/kubeadm/app/phases/addons/BUILD
View file @ a50aed79
...@@ -21,6 +21,7 @@ go_library( ...@@ -21,6 +21,7 @@ go_library(
"//cmd/kubeadm/app/images:go_default_library", "//cmd/kubeadm/app/images:go_default_library",
"//cmd/kubeadm/app/util:go_default_library", "//cmd/kubeadm/app/util:go_default_library",
"//pkg/api:go_default_library", "//pkg/api:go_default_library",
"//plugin/pkg/scheduler/algorithm:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
......
cmd/kubeadm/app/phases/addons/addons.go
View file @ a50aed79
...@@ -32,6 +32,7 @@ import ( ...@@ -32,6 +32,7 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/cmd/kubeadm/app/images"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
) )
// CreateEssentialAddons creates the kube-proxy and kube-dns addons // CreateEssentialAddons creates the kube-proxy and kube-dns addons
...@@ -44,10 +45,11 @@ func CreateEssentialAddons(cfg *kubeadmapi.MasterConfiguration, client *clientse ...@@ -44,10 +45,11 @@ func CreateEssentialAddons(cfg *kubeadmapi.MasterConfiguration, client *clientse
return fmt.Errorf("error when parsing kube-proxy configmap template: %v", err) return fmt.Errorf("error when parsing kube-proxy configmap template: %v", err)
} }
proxyDaemonSetBytes, err := kubeadmutil.ParseTemplate(KubeProxyDaemonSet, struct{ Image, ClusterCIDR, MasterTaintKey string }{ proxyDaemonSetBytes, err := kubeadmutil.ParseTemplate(KubeProxyDaemonSet, struct{ Image, ClusterCIDR, MasterTaintKey, CloudTaintKey string }{
Image: images.GetCoreImage("proxy", cfg, cfg.UnifiedControlPlaneImage), Image: images.GetCoreImage("proxy", cfg, cfg.UnifiedControlPlaneImage),
ClusterCIDR: getClusterCIDR(cfg.Networking.PodSubnet), ClusterCIDR: getClusterCIDR(cfg.Networking.PodSubnet),
MasterTaintKey: kubeadmconstants.LabelNodeRoleMaster, MasterTaintKey: kubeadmconstants.LabelNodeRoleMaster,
CloudTaintKey: algorithm.TaintExternalCloudProvider,
}) })
if err != nil { if err != nil {
return fmt.Errorf("error when parsing kube-proxy daemonset template: %v", err) return fmt.Errorf("error when parsing kube-proxy daemonset template: %v", err)
......
cmd/kubeadm/app/phases/addons/addons_test.go
View file @ a50aed79
...@@ -54,10 +54,11 @@ func TestCompileManifests(t *testing.T) { ...@@ -54,10 +54,11 @@ func TestCompileManifests(t *testing.T) {
}, },
{ {
manifest: KubeProxyDaemonSet, manifest: KubeProxyDaemonSet,
data: struct{ Image, ClusterCIDR, MasterTaintKey string }{ data: struct{ Image, ClusterCIDR, MasterTaintKey, CloudTaintKey string }{
Image: "foo", Image: "foo",
ClusterCIDR: "foo", ClusterCIDR: "foo",
MasterTaintKey: "foo", MasterTaintKey: "foo",
CloudTaintKey: "foo",
}, },
expected: true, expected: true,
}, },
......
cmd/kubeadm/app/phases/addons/manifests.go
View file @ a50aed79
...@@ -88,6 +88,9 @@ spec: ...@@ -88,6 +88,9 @@ spec:
tolerations: tolerations:
- key: {{ .MasterTaintKey }} - key: {{ .MasterTaintKey }}
effect: NoSchedule effect: NoSchedule
- key: {{ .CloudTaintKey }}
value: "true"
effect: NoSchedule
volumes: volumes:
- name: kube-proxy - name: kube-proxy
configMap: configMap:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment