upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-03-21 18:11:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #80648 from odinuge/kubeadm-upgrade-diff-err

Browse source 
Fix error handling issue in kubeadm upgrade diff
This commit is contained in:
Kubernetes Prow Robot 2019-07-26 20:16:48 -07:00 committed by GitHub
commit 9bae1bc568
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/upgrade/diff.go
View file

@ -25,6 +25,7 @@ import (
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/version"
client "k8s.io/client-go/kubernetes"
"k8s.io/klog"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
"k8s.io/kubernetes/cmd/kubeadm/app/cmd/options"
@ -86,7 +87,8 @@ func runDiff(flags *diffFlags, args []string) error {
if flags.cfgPath != "" {
cfg, err = configutil.LoadInitConfigurationFromFile(flags.cfgPath)
} else {
client, err := kubeconfigutil.ClientSetFromFile(flags.kubeConfigPath)
var client *client.Clientset
client, err = kubeconfigutil.ClientSetFromFile(flags.kubeConfigPath)
if err != nil {
return errors.Wrapf(err, "couldn't create a Kubernetes client from file %q", flags.kubeConfigPath)
}