diff --git a/cmd/kops/create_ig.go b/cmd/kops/create_ig.go index e488d1aece014..ddd15ad3e2129 100644 --- a/cmd/kops/create_ig.go +++ b/cmd/kops/create_ig.go @@ -27,6 +27,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" api "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/validation" @@ -130,7 +131,7 @@ func RunCreateInstanceGroup(f *util.Factory, cmd *cobra.Command, args []string, channel, err := cloudup.ChannelForCluster(cluster) if err != nil { - return err + klog.Warningf("%v", err) } existing, err := clientset.InstanceGroupsFor(cluster).Get(groupName, metav1.GetOptions{}) diff --git a/cmd/kops/edit_instancegroup.go b/cmd/kops/edit_instancegroup.go index c60d46c9fddb2..7c0a65f1c554c 100644 --- a/cmd/kops/edit_instancegroup.go +++ b/cmd/kops/edit_instancegroup.go @@ -25,6 +25,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" @@ -96,7 +97,7 @@ func RunEditInstanceGroup(f *util.Factory, cmd *cobra.Command, args []string, ou channel, err := cloudup.ChannelForCluster(cluster) if err != nil { - return err + klog.Warningf("%v", err) } clientset, err := rootCommand.Clientset() diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 424efccc99916..70a366a0f41cc 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -171,7 +171,7 @@ func (c *ApplyClusterCmd) Run() error { channel, err := ChannelForCluster(c.Cluster) if err != nil { - return err + klog.Warningf("%v", err) } c.channel = channel diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go index dc57b7127a97e..191590a712217 100644 --- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go +++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go @@ -116,6 +116,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" {