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

explicit kubelet config key in Node.Spec.ConfigSource.ConfigMap

Browse Source 
This makes the Kubelet config key in the ConfigMap an explicit part of
the API, so we can stop using magic key names.

As part of this change, we are retiring ConfigMapRef for ConfigMap.
This commit is contained in:
Michael Taufen
2018-01-29 09:32:48 -08:00
parent dc7f074213
commit c41cf55a2c
45 changed files with 2123 additions and 1267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/phases/kubelet/kubelet.go
View File

@@ -116,10 +116,11 @@ func updateNodeWithConfigMap(client clientset.Interface, nodeName string) error
}
node.Spec.ConfigSource = &v1.NodeConfigSource{
ConfigMapRef: &v1.ObjectReference{
Name: kubeadmconstants.KubeletBaseConfigurationConfigMap,
Namespace: metav1.NamespaceSystem,
UID: kubeletCfg.UID,
ConfigMap: &v1.ConfigMapNodeConfigSource{
Name: kubeadmconstants.KubeletBaseConfigurationConfigMap,
Namespace: metav1.NamespaceSystem,
UID: kubeletCfg.UID,
KubeletConfigKey: kubeadmconstants.KubeletBaseConfigurationConfigMapKey,
},
}

4
cmd/kubeadm/app/phases/kubelet/kubelet_test.go
View File

@@ -50,7 +50,7 @@ func TestCreateBaseKubeletConfiguration(t *testing.T) {
},
Spec: v1.NodeSpec{
ConfigSource: &v1.NodeConfigSource{
ConfigMapRef: &v1.ObjectReference{
ConfigMap: &v1.ConfigMapNodeConfigSource{
UID: "",
},
},
@@ -94,7 +94,7 @@ func TestUpdateNodeWithConfigMap(t *testing.T) {
},
Spec: v1.NodeSpec{
ConfigSource: &v1.NodeConfigSource{
ConfigMapRef: &v1.ObjectReference{
ConfigMap: &v1.ConfigMapNodeConfigSource{
UID: "",
},
},