kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3038 from justinsb/fix_3011 

Automatic merge from submit-queue

Handle the case where GetCluster returns nil
This commit is contained in:
Kubernetes Submit Queue 2017-07-24 02:36:21 -07:00 committed by GitHub
parent e8d2aa3d64 94fceff30a
commit 681c74e9a0
5 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kops/create.go
View File

@ -176,6 +176,10 @@ func RunCreate(f *util.Factory, out io.Writer, c *CreateOptions) error {
return fmt.Errorf("error querying cluster %q: %v", clusterName, err)
}
if cluster == nil {
return fmt.Errorf("cluster %q not found", clusterName)
}
_, err = clientset.InstanceGroupsFor(cluster).Create(v)
if err != nil {
if apierrors.IsAlreadyExists(err) {

4
cmd/kops/get_instancegroups.go
View File

@ -90,6 +90,10 @@ func RunGetInstanceGroups(options *GetInstanceGroupsOptions, args []string) erro
return fmt.Errorf("error fetching cluster %q: %v", clusterName, err)
}
if cluster == nil {
return fmt.Errorf("cluster %q was not found", clusterName)
}
list, err := clientset.InstanceGroupsFor(cluster).List(metav1.ListOptions{})
if err != nil {
return err

3
cmd/kops/replace.go
View File

@ -120,6 +120,9 @@ func RunReplace(f *util.Factory, cmd *cobra.Command, out io.Writer, c *ReplaceOp
if err != nil {
return fmt.Errorf("error fetching cluster %q: %v", clusterName, err)
}
if cluster == nil {
return fmt.Errorf("cluster %q not found", clusterName)
}
_, err = clientset.InstanceGroupsFor(cluster).Update(v)
if err != nil {
return fmt.Errorf("error replacing instanceGroup: %v", err)

4
cmd/kops/toolbox_convert_imported.go
View File

@ -104,6 +104,10 @@ func RunToolboxConvertImported(f *util.Factory, out io.Writer, options *ToolboxC
return err
}
if cluster == nil {
return fmt.Errorf("cluster %q not found", options.ClusterName)
}
list, err := clientset.InstanceGroupsFor(cluster).List(metav1.ListOptions{})
if err != nil {
return err

9
federation/apply_federation.go
View File

@ -71,6 +71,9 @@ func (o *ApplyFederationOperation) FindKubecfg() (*kubeconfig.KubeconfigBuilder,
if err != nil {
return nil, fmt.Errorf("error reading cluster %q: %v", controller, err)
}
if cluster == nil {
return nil, fmt.Errorf("cluster %q not found", controller)
}
context, err := o.federationContextForCluster(cluster)
if err != nil {
@ -120,6 +123,9 @@ func (o *ApplyFederationOperation) Run() error {
if err != nil {
return fmt.Errorf("error reading cluster %q: %v", controller, err)
}
if cluster == nil {
return fmt.Errorf("cluster %q not found", controller)
}
context, err := o.federationContextForCluster(cluster)
if err != nil {
@ -154,6 +160,9 @@ func (o *ApplyFederationOperation) Run() error {
if err != nil {
return fmt.Errorf("error reading cluster %q: %v", member, err)
}
if cluster == nil {
return fmt.Errorf("cluster %q not found", member)
}
clusterName := strings.Replace(cluster.Name, ".", "-", -1)