Fix tests

Author: jorge07

cmd/ami.go

@@ -6,7 +6,6 @@ import (
 	"github.com/kubernetes-incubator/kube-aws/core/root"
 	"github.com/kubernetes-incubator/kube-aws/flatcar/amiregistry"
 	"github.com/kubernetes-incubator/kube-aws/logger"
-	"github.com/kubernetes-incubator/kube-aws/model"
 	"github.com/spf13/cobra"
 )
 
@@ -35,8 +34,7 @@ func runCmdAmi(_ *cobra.Command, _ []string) error {
 	region := cluster.ControlPlane().Region.Name
 	channel := string(cluster.ControlPlane().ReleaseChannel)
 
-	releaseChannel := model.ReleaseChannel(channel)
-	amiID, err := amiregistry.GetAMI(region, releaseChannel)
+	amiID, err := amiregistry.GetAMI(region, cluster.ControlPlane().ReleaseChannel)
 	if err != nil {
 		return fmt.Errorf("Impossible to retrieve FlatCar AMI for region %s, channel %s", region, channel)
 	}

cmd/init.go

@@ -8,6 +8,7 @@ import (
 	"github.com/kubernetes-incubator/kube-aws/filegen"
 	"github.com/kubernetes-incubator/kube-aws/flatcar/amiregistry"
 	"github.com/kubernetes-incubator/kube-aws/logger"
+	"github.com/kubernetes-incubator/kube-aws/model"
 	"github.com/spf13/cobra"
 )
 
@@ -20,7 +21,8 @@ var (
 		SilenceUsage: true,
 	}
 
-	initOpts = config.InitialConfig{}
+	initOpts       = config.InitialConfig{}
+	releaseChannel = ""
 )
 
 const (
@@ -38,6 +40,7 @@ func init() {
 	cmdInit.Flags().StringVar(&initOpts.KeyName, "key-name", "", "The AWS key-pair for ssh access to nodes")
 	cmdInit.Flags().StringVar(&initOpts.KMSKeyARN, "kms-key-arn", "", "The ARN of the AWS KMS key for encrypting TLS assets")
 	cmdInit.Flags().StringVar(&initOpts.AmiId, "ami-id", "", "The AMI ID of Flatcar. Last Flatcar Stable Channel selected by default if empty")
+	cmdInit.Flags().StringVar(&releaseChannel, "release-channel", defaultReleaseChannel, "Flatcar release channel for AMI")
 	cmdInit.Flags().BoolVar(&initOpts.NoRecordSet, "no-record-set", false, "Instruct kube-aws to not manage Route53 record sets for your K8S API endpoints")
 }
 
@@ -55,12 +58,14 @@ func runCmdInit(_ *cobra.Command, _ []string) error {
 
 	if initOpts.AmiId == "" {
 		amiID, err := amiregistry.GetAMI(initOpts.Region.Name, defaultReleaseChannel)
-		initOpts.AmiId = amiID
 		if err != nil {
 			return fmt.Errorf("cannot retrieve Flatcar AMI for region %s, channel %s", initOpts.Region.Name, defaultReleaseChannel)
 		}
+		initOpts.AmiId = amiID
 	}
 
+	initOpts.ReleaseChannel = model.ReleaseChannel(defaultReleaseChannel)
+
 	if !initOpts.NoRecordSet && initOpts.HostedZoneID == "" {
 		return errors.New("missing required flags: either --hosted-zone-id or --no-record-set is required")
 	}

core/controlplane/cluster/cluster_test.go

@@ -29,6 +29,7 @@ func defaultConfigValues(t *testing.T, configYaml string) string {
 	defaultYaml := `
 externalDNSName: test.staging.core-os.net
 keyName: test-key-name
+releaseChannel: stable
 s3URI: s3://mybucket/mydir
 region: us-west-1
 clusterName: test-cluster-name

core/controlplane/config/config.go

@@ -174,6 +174,7 @@ func NewDefaultCluster() *Cluster {
 			K8sVer:             k8sVer,
 			ContainerRuntime:   "docker",
 			Subnets:            []model.Subnet{},
+			ReleaseChannel:     model.DefaultReleaseChannel(),
 			EIPAllocationIDs:   []string{},
 			Experimental:       experimental,
 			Kubelet:            kubelet,

core/controlplane/config/config_test.go

@@ -515,7 +515,7 @@ releaseChannel: non-existent #this release channel will never exist
 			t.Errorf("failed to parse config %s: %v", confBody, err)
 			continue
 		}
-		if c.ReleaseChannel != conf.channel {
+		if string(c.ReleaseChannel) != conf.channel {
 			t.Errorf(
 				"parsed release channel %s does not match config: %s",
 				c.ReleaseChannel,

model/release_channel.go

@@ -18,3 +18,7 @@ func (ch ReleaseChannel) IsValid() error {
 	}
 	return errors.New("Invalid Release Channel")
 }
+
+func DefaultReleaseChannel() ReleaseChannel {
+	return ReleaseChannel(stable)
+}