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

Merge pull request #123093 from SataQiu/revert-115575-fix-20230207

Browse Source 
Revert "kubeadm: fix a bug where the uploaded kubelet configuration in kube-system/kubelet-config ConfigMap does not respect user patch"
This commit is contained in:
Kubernetes Prow Robot
2024-02-02 12:47:32 -08:00
committed by GitHub
parent 42941cb88a f47c2a1ba6
commit 4a4f5dbc07
4 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/kubeadm/app/cmd/phases/init/uploadconfig.go
View File

@@ -104,7 +104,7 @@ func getUploadConfigPhaseFlags() []string {
// runUploadKubeadmConfig uploads the kubeadm configuration to a ConfigMap // runUploadKubeadmConfig uploads the kubeadm configuration to a ConfigMap
func runUploadKubeadmConfig(c workflow.RunData) error { func runUploadKubeadmConfig(c workflow.RunData) error {
cfg, client, _, err := getUploadConfigData(c) cfg, client, err := getUploadConfigData(c)
if err != nil { if err != nil {
return err return err
} }
@@ -118,13 +118,13 @@ func runUploadKubeadmConfig(c workflow.RunData) error {
// runUploadKubeletConfig uploads the kubelet configuration to a ConfigMap // runUploadKubeletConfig uploads the kubelet configuration to a ConfigMap
func runUploadKubeletConfig(c workflow.RunData) error { func runUploadKubeletConfig(c workflow.RunData) error {
cfg, client, patchesDir, err := getUploadConfigData(c) cfg, client, err := getUploadConfigData(c)
if err != nil { if err != nil {
return err return err
} }
klog.V(1).Infoln("[upload-config] Uploading the kubelet component config to a ConfigMap") klog.V(1).Infoln("[upload-config] Uploading the kubelet component config to a ConfigMap")
if err = kubeletphase.CreateConfigMap(&cfg.ClusterConfiguration, patchesDir, client); err != nil { if err = kubeletphase.CreateConfigMap(&cfg.ClusterConfiguration, client); err != nil {
return errors.Wrap(err, "error creating kubelet configuration ConfigMap") return errors.Wrap(err, "error creating kubelet configuration ConfigMap")
} }
@@ -135,15 +135,15 @@ func runUploadKubeletConfig(c workflow.RunData) error {
return nil return nil
} }
func getUploadConfigData(c workflow.RunData) (*kubeadmapi.InitConfiguration, clientset.Interface, string, error) { func getUploadConfigData(c workflow.RunData) (*kubeadmapi.InitConfiguration, clientset.Interface, error) {
data, ok := c.(InitData) data, ok := c.(InitData)
if !ok { if !ok {
return nil, nil, "", errors.New("upload-config phase invoked with an invalid data struct") return nil, nil, errors.New("upload-config phase invoked with an invalid data struct")
} }
cfg := data.Cfg() cfg := data.Cfg()
client, err := data.Client() client, err := data.Client()
if err != nil { if err != nil {
return nil, nil, "", err return nil, nil, err
} }
return cfg, client, data.PatchesDir(), err return cfg, client, err
} }

16
cmd/kubeadm/app/phases/kubelet/config.go
View File

@@ -68,7 +68,10 @@ func WriteConfigToDisk(cfg *kubeadmapi.ClusterConfiguration, kubeletDir, patches
// CreateConfigMap creates a ConfigMap with the generic kubelet configuration. // CreateConfigMap creates a ConfigMap with the generic kubelet configuration.
// Used at "kubeadm init" and "kubeadm upgrade" time // Used at "kubeadm init" and "kubeadm upgrade" time
func CreateConfigMap(cfg *kubeadmapi.ClusterConfiguration, patchesDir string, client clientset.Interface) error { func CreateConfigMap(cfg *kubeadmapi.ClusterConfiguration, client clientset.Interface) error {
configMapName := kubeadmconstants.KubeletBaseConfigurationConfigMap
fmt.Printf("[kubelet] Creating a ConfigMap %q in namespace %s with the configuration for the kubelets in the cluster\n", configMapName, metav1.NamespaceSystem)
kubeletCfg, ok := cfg.ComponentConfigs[componentconfigs.KubeletGroup] kubeletCfg, ok := cfg.ComponentConfigs[componentconfigs.KubeletGroup]
if !ok { if !ok {
return errors.New("no kubelet component config found in the active component config set") return errors.New("no kubelet component config found in the active component config set")
@@ -79,17 +82,6 @@ func CreateConfigMap(cfg *kubeadmapi.ClusterConfiguration, patchesDir string, cl
return err return err
} }
// Apply patches to the KubeletConfiguration
if len(patchesDir) != 0 {
kubeletBytes, err = applyKubeletConfigPatches(kubeletBytes, patchesDir, os.Stdout)
if err != nil {
return errors.Wrap(err, "could not apply patches to the KubeletConfiguration")
}
}
configMapName := kubeadmconstants.KubeletBaseConfigurationConfigMap
fmt.Printf("[kubelet] Creating a ConfigMap %q in namespace %s with the configuration for the kubelets in the cluster\n", configMapName, metav1.NamespaceSystem)
configMap := &v1.ConfigMap{ configMap := &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: configMapName, Name: configMapName,

2
cmd/kubeadm/app/phases/kubelet/config_test.go
View File

@@ -58,7 +58,7 @@ func TestCreateConfigMap(t *testing.T) {
t.Fatalf("unexpected failure when defaulting InitConfiguration: %v", err) t.Fatalf("unexpected failure when defaulting InitConfiguration: %v", err)
} }
if err := CreateConfigMap(&internalcfg.ClusterConfiguration, "", client); err != nil { if err := CreateConfigMap(&internalcfg.ClusterConfiguration, client); err != nil {
t.Errorf("CreateConfigMap: unexpected error %v", err) t.Errorf("CreateConfigMap: unexpected error %v", err)
} }
} }

2
cmd/kubeadm/app/phases/upgrade/postupgrade.go
View File

@@ -61,7 +61,7 @@ func PerformPostUpgradeTasks(client clientset.Interface, cfg *kubeadmapi.InitCon
} }
// Create the new, version-branched kubelet ComponentConfig ConfigMap // Create the new, version-branched kubelet ComponentConfig ConfigMap
if err := kubeletphase.CreateConfigMap(&cfg.ClusterConfiguration, patchesDir, client); err != nil { if err := kubeletphase.CreateConfigMap(&cfg.ClusterConfiguration, client); err != nil {
errs = append(errs, errors.Wrap(err, "error creating kubelet configuration ConfigMap")) errs = append(errs, errors.Wrap(err, "error creating kubelet configuration ConfigMap"))
} }