github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-04 07:49:35 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: Start using Tolerations in yaml code again

Browse Source
This commit is contained in:
Lucas Käldström
2017-06-28 15:06:39 +03:00
parent b84567a57e
commit 7baff10bfc
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kubeadm/app/phases/addons/addons.go
View File

@@ -110,7 +110,6 @@ func CreateKubeProxyAddon(configMapBytes, daemonSetbytes []byte, client *clients
if err := kuberuntime.DecodeInto(api.Codecs.UniversalDecoder(), daemonSetbytes, kubeproxyDaemonSet); err != nil { if err := kuberuntime.DecodeInto(api.Codecs.UniversalDecoder(), daemonSetbytes, kubeproxyDaemonSet); err != nil {
return fmt.Errorf("unable to decode kube-proxy daemonset %v", err) return fmt.Errorf("unable to decode kube-proxy daemonset %v", err)
} }
kubeproxyDaemonSet.Spec.Template.Spec.Tolerations = []v1.Toleration{kubeadmconstants.MasterToleration}
if _, err := client.ExtensionsV1beta1().DaemonSets(metav1.NamespaceSystem).Create(kubeproxyDaemonSet); err != nil { if _, err := client.ExtensionsV1beta1().DaemonSets(metav1.NamespaceSystem).Create(kubeproxyDaemonSet); err != nil {
if !apierrors.IsAlreadyExists(err) { if !apierrors.IsAlreadyExists(err) {
@@ -129,13 +128,6 @@ func CreateKubeDNSAddon(deploymentBytes, serviceBytes []byte, client *clientset.
if err := kuberuntime.DecodeInto(api.Codecs.UniversalDecoder(), deploymentBytes, kubednsDeployment); err != nil { if err := kuberuntime.DecodeInto(api.Codecs.UniversalDecoder(), deploymentBytes, kubednsDeployment); err != nil {
return fmt.Errorf("unable to decode kube-dns deployment %v", err) return fmt.Errorf("unable to decode kube-dns deployment %v", err)
} }
kubednsDeployment.Spec.Template.Spec.Tolerations = []v1.Toleration{
kubeadmconstants.MasterToleration,
{
Key: "CriticalAddonsOnly",
Operator: "Exists",
},
}
if _, err := client.ExtensionsV1beta1().Deployments(metav1.NamespaceSystem).Create(kubednsDeployment); err != nil { if _, err := client.ExtensionsV1beta1().Deployments(metav1.NamespaceSystem).Create(kubednsDeployment); err != nil {
if !apierrors.IsAlreadyExists(err) { if !apierrors.IsAlreadyExists(err) {

21
cmd/kubeadm/app/phases/addons/manifests.go
View File

@@ -79,10 +79,9 @@ spec:
name: kube-proxy name: kube-proxy
hostNetwork: true hostNetwork: true
serviceAccountName: kube-proxy serviceAccountName: kube-proxy
# TODO: Why doesn't the Decoder recognize this new field and decode it properly? Right now it's ignored tolerations:
# tolerations: - key: {{ .MasterTaintKey }}
# - key: {{ .MasterTaintKey }} effect: NoSchedule
# effect: NoSchedule
volumes: volumes:
- name: kube-proxy - name: kube-proxy
configMap: configMap:
@@ -92,7 +91,6 @@ spec:
KubeDNSVersion = "1.14.2" KubeDNSVersion = "1.14.2"
KubeDNSDeployment = ` KubeDNSDeployment = `
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@@ -116,8 +114,6 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
volumes: volumes:
- name: kube-dns-config - name: kube-dns-config
@@ -243,12 +239,11 @@ spec:
cpu: 10m cpu: 10m
dnsPolicy: Default # Don't use cluster DNS. dnsPolicy: Default # Don't use cluster DNS.
serviceAccountName: kube-dns serviceAccountName: kube-dns
# TODO: Why doesn't the Decoder recognize this new field and decode it properly? Right now it's ignored tolerations:
# tolerations: - key: CriticalAddonsOnly
# - key: CriticalAddonsOnly operator: Exists
# operator: Exists - key: {{ .MasterTaintKey }}
# - key: {{ .MasterTaintKey }} effect: NoSchedule
# effect: NoSchedule
# TODO: Remove this affinity field as soon as we are using manifest lists # TODO: Remove this affinity field as soon as we are using manifest lists
affinity: affinity:
nodeAffinity: nodeAffinity: