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

kubeadm: add missing "kubeadm config print upgrade-defaults"

Browse Source
This commit is contained in:
Lubomir I. Ivanov
2024-05-21 15:03:23 +03:00
parent 6544d19796
commit b9f7661ab8
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/kubeadm/app/cmd/config.go
View File

@@ -94,6 +94,7 @@ func newCmdConfigPrint(out io.Writer) *cobra.Command {
cmd.AddCommand(newCmdConfigPrintInitDefaults(out)) cmd.AddCommand(newCmdConfigPrintInitDefaults(out))
cmd.AddCommand(newCmdConfigPrintJoinDefaults(out)) cmd.AddCommand(newCmdConfigPrintJoinDefaults(out))
cmd.AddCommand(newCmdConfigPrintResetDefaults(out)) cmd.AddCommand(newCmdConfigPrintResetDefaults(out))
cmd.AddCommand(newCmdConfigPrintUpgradeDefaults(out))
return cmd return cmd
} }
@@ -112,6 +113,11 @@ func newCmdConfigPrintResetDefaults(out io.Writer) *cobra.Command {
return newCmdConfigPrintActionDefaults(out, "reset", getDefaultResetConfigBytes) return newCmdConfigPrintActionDefaults(out, "reset", getDefaultResetConfigBytes)
} }
// newCmdConfigPrintUpgradeDefaults returns cobra.Command for "kubeadm config print upgrade-defaults" command
func newCmdConfigPrintUpgradeDefaults(out io.Writer) *cobra.Command {
return newCmdConfigPrintActionDefaults(out, "upgrade", getDefaultUpgradeConfigBytes)
}
func newCmdConfigPrintActionDefaults(out io.Writer, action string, configBytesProc func() ([]byte, error)) *cobra.Command { func newCmdConfigPrintActionDefaults(out io.Writer, action string, configBytesProc func() ([]byte, error)) *cobra.Command {
kinds := []string{} kinds := []string{}
cmd := &cobra.Command{ cmd := &cobra.Command{
@@ -242,6 +248,18 @@ func getDefaultResetConfigBytes() ([]byte, error) {
return configutil.MarshalKubeadmConfigObject(internalcfg, kubeadmapiv1.SchemeGroupVersion) return configutil.MarshalKubeadmConfigObject(internalcfg, kubeadmapiv1.SchemeGroupVersion)
} }
func getDefaultUpgradeConfigBytes() ([]byte, error) {
opts := configutil.LoadOrDefaultConfigurationOptions{
SkipCRIDetect: true,
}
internalcfg, err := configutil.DefaultedUpgradeConfiguration(&kubeadmapiv1.UpgradeConfiguration{}, opts)
if err != nil {
return []byte{}, err
}
return configutil.MarshalKubeadmConfigObject(internalcfg, kubeadmapiv1.SchemeGroupVersion)
}
// newCmdConfigMigrate returns cobra.Command for "kubeadm config migrate" command // newCmdConfigMigrate returns cobra.Command for "kubeadm config migrate" command
func newCmdConfigMigrate(out io.Writer) *cobra.Command { func newCmdConfigMigrate(out io.Writer) *cobra.Command {
var oldCfgPath, newCfgPath string var oldCfgPath, newCfgPath string