scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change taint/toleration annotations to api fields.

Browse Source
This commit is contained in:
Avesh Agarwal
2017-02-20 11:43:05 -05:00
parent eef16cf141
commit 9b640838a5
22 changed files with 116 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/kubelet_node_status.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package kubelet
import (
"encoding/json"
"fmt"
"math"
"net"
@@ -204,19 +203,13 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) {
},
}
if len(kl.kubeletConfiguration.RegisterWithTaints) > 0 {
annotations := make(map[string]string)
taints := make([]v1.Taint, len(kl.kubeletConfiguration.RegisterWithTaints))
for i := range kl.kubeletConfiguration.RegisterWithTaints {
if err := v1.Convert_api_Taint_To_v1_Taint(&kl.kubeletConfiguration.RegisterWithTaints[i], &taints[i], nil); err != nil {
return nil, err
}
}
b, err := json.Marshal(taints)
if err != nil {
return nil, err
}
annotations[v1.TaintsAnnotationKey] = string(b)
node.ObjectMeta.Annotations = annotations
node.Spec.Taints = taints
}
// Initially, set NodeNetworkUnavailable to true.