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

Allow cluster maintenance when channel is unavailable

This commit is contained in:
John Gardiner Myers 2020-05-03 13:48:15 -07:00
parent 1620bf5ed3
commit 126c4c8d37
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kops/create_ig.go
View File

@ -28,6 +28,7 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"k8s.io/kops/cmd/kops/util"
kopsapi "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/validation"
@ -132,7 +133,7 @@ func RunCreateInstanceGroup(ctx context.Context, f *util.Factory, cmd *cobra.Com
channel, err := cloudup.ChannelForCluster(cluster)
if err != nil {
return err
klog.Warningf("%v", err)
}
existing, err := clientset.InstanceGroupsFor(cluster).Get(ctx, groupName, metav1.GetOptions{})

3
cmd/kops/edit_instancegroup.go
View File

@ -26,6 +26,7 @@ import (
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"k8s.io/kops/cmd/kops/util"
api "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/validation"
@ -98,7 +99,7 @@ func RunEditInstanceGroup(ctx context.Context, f *util.Factory, cmd *cobra.Comma
channel, err := cloudup.ChannelForCluster(cluster)
if err != nil {
return err
klog.Warningf("%v", err)
}
clientset, err := rootCommand.Clientset()

2
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -174,7 +174,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error {
channel, err := ChannelForCluster(c.Cluster)
if err != nil {
return err
klog.Warningf("%v", err)
}
c.channel = channel

3
upup/pkg/fi/cloudup/populate_instancegroup_spec.go
View File

@ -117,6 +117,9 @@ func PopulateInstanceGroupSpec(cluster *kops.Cluster, input *kops.InstanceGroup,
if ig.Spec.Image == "" {
ig.Spec.Image = defaultImage(cluster, channel)
if ig.Spec.Image == "" {
return nil, fmt.Errorf("unable to determine default image for InstanceGroup %s", ig.ObjectMeta.Name)
}
}
if ig.Spec.Tenancy != "" && ig.Spec.Tenancy != "default" {