Merge pull request #871 from mumoshu/fix-release-channel-for-node-pool

Fix node pool release channel

Author: mumoshu

core/nodepool/config/deployment.go

@@ -78,12 +78,15 @@ func (c DeploymentSettings) WithDefaultsFrom(main cfg.DeploymentSettings) Deploy
 
 	// No defaulting for AvailabilityZone: It must be set explicitly for high availability
 
+	// If there was a specific release channel specified for this node pool,
+	// the user would want to use the latest AMI for the channel, not the latest AMI for the default release channel
+	// specified in the top level of cluster.yaml
 	if c.ReleaseChannel == "" {
 		c.ReleaseChannel = main.ReleaseChannel
-	}
 
-	if c.AmiId == "" {
-		c.AmiId = main.AmiId
+		if c.AmiId == "" {
+			c.AmiId = main.AmiId
+		}
 	}
 
 	if c.K8sVer == "" {

test/integration/maincluster_test.go

@@ -575,6 +575,38 @@ worker:
 				hasDefaultCluster,
 			},
 		},
+		{
+			context: "WithDifferentReleaseChannels",
+			configYaml: minimalValidConfigYaml + `
+releaseChannel: stable
+worker:
+  nodePools:
+  - name: pool1
+    releaseChanel: alpha
+`,
+			assertConfig: []ConfigTester{
+				hasDefaultEtcdSettings,
+				asgBasedNodePoolHasWaitSignalEnabled,
+			},
+			assertCluster: []ClusterTester{
+				func(c root.Cluster, t *testing.T) {
+					cp := c.ControlPlane().StackConfig.AMI
+					np := c.NodePools()[0].AMI
+
+					if cp == "" {
+						t.Error("the default AMI ID should not be empty but it was")
+					}
+
+					if np == "" {
+						t.Error("the AMI ID for the node pool should not be empty but it was")
+					}
+
+					if cp != np {
+						t.Errorf("the default AMI ID and the AMI ID for the node pool didn't match: default=%s, nodepool=%s", cp, np)
+					}
+				},
+			},
+		},
 		{
 			context: "WithElasticFileSystemId",
 			configYaml: minimalValidConfigYaml + `