From 78bfff0afe03550eea5f1683de299809bac66ec2 Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Sun, 29 Sep 2019 11:34:31 -0700
Subject: [PATCH] Update Fedora CoreOS to testing 30.20190905.0

* Fix duplicated cluster_domain_suffix variable
---
 aws/fedora-coreos/kubernetes/ami.tf         | 2 +-
 aws/fedora-coreos/kubernetes/variables.tf   | 6 ------
 aws/fedora-coreos/kubernetes/workers/ami.tf | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/aws/fedora-coreos/kubernetes/ami.tf b/aws/fedora-coreos/kubernetes/ami.tf
index 71322d17..626b1f83 100644
--- a/aws/fedora-coreos/kubernetes/ami.tf
+++ b/aws/fedora-coreos/kubernetes/ami.tf
@@ -16,6 +16,6 @@ data "aws_ami" "fedora-coreos" {
   // pin on known ok versions as preview matures
   filter {
     name   = "name"
-    values = ["fedora-coreos-30.20190801.0-hvm"]
+    values = ["fedora-coreos-30.20190905.0-hvm"]
   }
 }
diff --git a/aws/fedora-coreos/kubernetes/variables.tf b/aws/fedora-coreos/kubernetes/variables.tf
index 6b8d3e76..dc25a415 100644
--- a/aws/fedora-coreos/kubernetes/variables.tf
+++ b/aws/fedora-coreos/kubernetes/variables.tf
@@ -134,12 +134,6 @@ EOD
   default = "10.3.0.0/16"
 }
 
-variable "cluster_domain_suffix" {
-  type = string
-  description = "Queries for domains with the suffix will be answered by coredns. Default is cluster.local (e.g. foo.default.svc.cluster.local) "
-  default = "cluster.local"
-}
-
 variable "enable_reporting" {
   type = bool
   description = "Enable usage or analytics reporting to upstreams (Calico)"
diff --git a/aws/fedora-coreos/kubernetes/workers/ami.tf b/aws/fedora-coreos/kubernetes/workers/ami.tf
index 71322d17..626b1f83 100644
--- a/aws/fedora-coreos/kubernetes/workers/ami.tf
+++ b/aws/fedora-coreos/kubernetes/workers/ami.tf
@@ -16,6 +16,6 @@ data "aws_ami" "fedora-coreos" {
   // pin on known ok versions as preview matures
   filter {
     name   = "name"
-    values = ["fedora-coreos-30.20190801.0-hvm"]
+    values = ["fedora-coreos-30.20190905.0-hvm"]
   }
 }