Merge pull request #40 from enxebre/filters

add machineSet ami filters

machines/aws/machine-set.yaml

@@ -28,6 +28,19 @@ spec:
           kind: AWSMachineProviderConfig
           ami:
             id: {{.AWS.Image}}
+            filters:
+              - name: "name"
+                values:
+                - CoreOS-{{.AWS.ReleaseChannel}}-{{.AWS.ContainerLinuxVersion}}-*
+              - name: "architecture"
+                values:
+                - "x86_64"
+              - name: "virtualization-type"
+                values:
+                - "hvm"
+              - name: "owner-id"
+                values:
+                - "595879546273"
           instanceType: m4.large
           placement:
             region: {{.AWS.Region}}
@@ -36,7 +49,7 @@ spec:
             filters:
             - name: "tag:Name"
               values:
-              - {{.AWS.ClusterName}}-worker-{{.AWS.AvailabilityZone}}
+              - {{.AWS.ClusterName}}-worker-*
           publicIp: true
           iamInstanceProfile:
             id: {{.AWS.ClusterName}}-master-profile

pkg/render/config.go

@@ -26,10 +26,12 @@ type libvirtConfig struct {
 }
 
 type awsConfig struct {
-	ClusterName      string `json:"clusterName"`
-	ClusterID        string `json:"clusterID"`
-	Region           string `json:"region"`
-	AvailabilityZone string `json:"availabilityZone"`
-	Image            string `json:"image"`
-	Replicas         string `json:"replicas"`
+	ClusterName           string `json:"clusterName"`
+	ClusterID             string `json:"clusterID"`
+	Region                string `json:"region"`
+	AvailabilityZone      string `json:"availabilityZone"`
+	Image                 string `json:"image"`
+	ReleaseChannel        string `json:"releaseChannel"`
+	ContainerLinuxVersion string `json:"containerLinuxVersion"`
+	Replicas              string `json:"replicas"`
 }

pkg/render/render_test.go

@@ -69,12 +69,14 @@ func TestMachineSetAWSManifest(t *testing.T) {
 	config := OperatorConfig{
 		Provider: "aws",
 		AWS: &awsConfig{
-			ClusterName:      "TestClusterManifest-ClusterName",
-			ClusterID:        "TestClusterManifest-ClusterID",
-			Region:           "TestClusterManifest-Region",
-			AvailabilityZone: "TestClusterManifest-AvailabilityZone",
-			Image:            "TestClusterManifest-Image",
-			Replicas:         "TestClusterManifest-Replicas",
+			ClusterName:           "TestClusterManifest-ClusterName",
+			ClusterID:             "TestClusterManifest-ClusterID",
+			ReleaseChannel:        "TestChannel",
+			ContainerLinuxVersion: "TestCLVersion",
+			Region:                "TestClusterManifest-Region",
+			AvailabilityZone:      "TestClusterManifest-AvailabilityZone",
+			Image:                 "TestClusterManifest-Image",
+			Replicas:              "TestClusterManifest-Replicas",
 		},
 	}
 
@@ -109,6 +111,19 @@ spec:
           kind: AWSMachineProviderConfig
           ami:
             id: TestClusterManifest-Image
+            filters:
+              - name: "name"
+                values:
+                - CoreOS-TestChannel-TestCLVersion-*
+              - name: "architecture"
+                values:
+                - "x86_64"
+              - name: "virtualization-type"
+                values:
+                - "hvm"
+              - name: "owner-id"
+                values:
+                - "595879546273"
           instanceType: m4.large
           placement:
             region: TestClusterManifest-Region
@@ -117,7 +132,7 @@ spec:
             filters:
             - name: "tag:Name"
               values:
-              - TestClusterManifest-ClusterName-worker-TestClusterManifest-AvailabilityZone
+              - TestClusterManifest-ClusterName-worker-*
           publicIp: true
           iamInstanceProfile:
             id: TestClusterManifest-ClusterName-master-profile