Created
July 14, 2018 01:35
-
-
Save bookshelfdave/6d2b30ad4655d15dbd57e8fdb88f1ea6 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ε !:! ~/go/src/k8s.io/kubernetes $ git diff | |
| diff --git a/cmd/kubeadm/app/cmd/upgrade/diff.go b/cmd/kubeadm/app/cmd/upgrade/diff.go | |
| index c0223fedb9..46404a2901 100644 | |
| --- a/cmd/kubeadm/app/cmd/upgrade/diff.go | |
| +++ b/cmd/kubeadm/app/cmd/upgrade/diff.go | |
| @@ -26,6 +26,7 @@ import ( | |
| "github.com/spf13/cobra" | |
| corev1 "k8s.io/api/core/v1" | |
| kubeadmapiv1alpha3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3" | |
| + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" | |
| cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" | |
| "k8s.io/kubernetes/cmd/kubeadm/app/constants" | |
| "k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane" | |
| @@ -66,7 +67,10 @@ func NewCmdDiff(out io.Writer) *cobra.Command { | |
| } | |
| // TODO: Use the generic options.AddConfigFlag method instead | |
| - cmd.Flags().StringVar(&flags.cfgPath, "config", flags.cfgPath, "Path to kubeadm config file. WARNING: Usage of a configuration file is experimental!") | |
| + // fs *pflag.FlagSet | |
| + | |
| + options.AddConfigFlag(cmd.Flags(), &flags.cfgPath) | |
| + //cmd.Flags().StringVar(&flags.cfgPath, "config", flags.cfgPath, "Path to kubeadm config file. WARNING: Usage of a configuration file is experimental!") | |
| cmd.Flags().StringVar(&flags.apiServerManifestPath, "api-server-manifest", defaultAPIServerManifestPath, "path to API server manifest") | |
| cmd.Flags().StringVar(&flags.controllerManagerManifestPath, "controller-manager-manifest", defaultControllerManagerManifestPath, "path to controller manifest") | |
| cmd.Flags().StringVar(&flags.schedulerManifestPath, "scheduler-manifest", defaultSchedulerManifestPath, "path to scheduler manifest") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment