Skip to content

K
k3s
Unverified Commit eda5a296 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

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

kubeadm: upload the `ClusterConfiguration` during the upgrade
parents baa20306 b6f4bb34
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go
View file @ eda5a296
...@@ -101,6 +101,10 @@ func UploadConfiguration(cfg *kubeadmapi.InitConfiguration, client clientset.Int ...@@ -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.
......
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