github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77513 from ereslibre/upload-cluster-configuration-after-upgrade

Browse Source 
kubeadm: upload the `ClusterConfiguration` during the upgrade
This commit is contained in:
Kubernetes Prow Robot
2019-05-08 17:15:13 -07:00
committed by GitHub
parent baa2030683 b6f4bb349b
commit eda5a296a8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go
View File

@@ -101,6 +101,10 @@ func UploadConfiguration(cfg *kubeadmapi.InitConfiguration, client clientset.Int
kubeadmconstants.ClusterStatusConfigMapKey: string(clusterStatusYaml), kubeadmconstants.ClusterStatusConfigMapKey: string(clusterStatusYaml),
}, },
}, func(cm *v1.ConfigMap) error { }, func(cm *v1.ConfigMap) error {
// Upgrade will call to UploadConfiguration with a modified KubernetesVersion reflecting the new
// Kubernetes version. In that case, the mutation path will take place.
cm.Data[kubeadmconstants.ClusterConfigurationConfigMapKey] = string(clusterConfigurationYaml)
// Mutate the ClusterStatus now
return mutateClusterStatus(cm, func(cs *kubeadmapi.ClusterStatus) error { return mutateClusterStatus(cm, func(cs *kubeadmapi.ClusterStatus) error {
// Handle a nil APIEndpoints map. Should only happen if someone manually // Handle a nil APIEndpoints map. Should only happen if someone manually
// interacted with the ConfigMap. // interacted with the ConfigMap.