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

Merge pull request #125779 from SataQiu/fix-upgrade-diff-20240628

Browse Source 
kubeadm: fix a bug where the path of the manifest can not be specified when 'upgrade diff' specified a config file
This commit is contained in:
Kubernetes Prow Robot
2024-06-28 07:04:00 -07:00
committed by GitHub
parent eb66365bc4 7c2384d374
commit 5e331569e4
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View File

@@ -609,6 +609,7 @@ func isAllowedFlag(flagName string) bool {
kubeadmcmdoptions.NodeName, kubeadmcmdoptions.NodeName,
kubeadmcmdoptions.KubeconfigDir, kubeadmcmdoptions.KubeconfigDir,
kubeadmcmdoptions.UploadCerts, kubeadmcmdoptions.UploadCerts,
"api-server-manifest", "controller-manager-manifest", "scheduler-manifest", // TODO: remove this line when these flags are deprecated and dropped from "kubeadm upgrade diff"
"print-join-command", "rootfs", "v", "log-file", "yes") "print-join-command", "rootfs", "v", "log-file", "yes")
if allowedFlags.Has(flagName) { if allowedFlags.Has(flagName) {
return true return true

3
cmd/kubeadm/app/cmd/upgrade/diff.go
View File

@@ -89,8 +89,11 @@ func newCmdDiff(out io.Writer) *cobra.Command {
options.AddKubeConfigFlag(cmd.Flags(), &flags.kubeConfigPath) options.AddKubeConfigFlag(cmd.Flags(), &flags.kubeConfigPath)
options.AddConfigFlag(cmd.Flags(), &flags.cfgPath) options.AddConfigFlag(cmd.Flags(), &flags.cfgPath)
cmd.Flags().StringVar(&flags.apiServerManifestPath, "api-server-manifest", defaultAPIServerManifestPath, "path to API server manifest") cmd.Flags().StringVar(&flags.apiServerManifestPath, "api-server-manifest", defaultAPIServerManifestPath, "path to API server manifest")
cmd.Flags().MarkDeprecated("api-server-manifest", "This flag is deprecated and will be removed in a future release.")
cmd.Flags().StringVar(&flags.controllerManagerManifestPath, "controller-manager-manifest", defaultControllerManagerManifestPath, "path to controller manifest") cmd.Flags().StringVar(&flags.controllerManagerManifestPath, "controller-manager-manifest", defaultControllerManagerManifestPath, "path to controller manifest")
cmd.Flags().MarkDeprecated("controller-manager-manifest", "This flag is deprecated and will be removed in a future release.")
cmd.Flags().StringVar(&flags.schedulerManifestPath, "scheduler-manifest", defaultSchedulerManifestPath, "path to scheduler manifest") cmd.Flags().StringVar(&flags.schedulerManifestPath, "scheduler-manifest", defaultSchedulerManifestPath, "path to scheduler manifest")
cmd.Flags().MarkDeprecated("scheduler-manifest", "This flag is deprecated and will be removed in a future release.")
cmd.Flags().IntVarP(&flags.contextLines, "context-lines", "c", 3, "How many lines of context in the diff") cmd.Flags().IntVarP(&flags.contextLines, "context-lines", "c", 3, "How many lines of context in the diff")
return cmd return cmd