Merge pull request #78 from utilitywarehouse/etcd-certs

include first node's ip in all etcd member's SANs
utilitywarehouse · Apr 1, 2019 · d953d61 · d953d61
2 parents aba5888 + 41dd5cb
commit d953d61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/etcd.tf b/etcd.tf
@@ -17,8 +17,13 @@ data "template_file" "etcd-cfssl-new-cert" {
     org       = ""
     get_ip    = "${var.get_ip_command[var.cloud_provider]}"
 
+    # workaround for https://github.com/kubernetes/kubernetes/issues/72102
+    # include first member's ip in SAN for all nodes
+    # this replicates kubeadm behaviour to include first node's ip, as kubeadm
+    # generates all certificates on the first node
     extra_names = "${join(",", list(
       "etcd.${var.dns_domain}",
+      "${var.etcd_addresses[0]}",
     ))}"
   }
 }

diff --git a/variables.tf b/variables.tf
@@ -54,7 +54,7 @@ variable "hyperkube_image_url" {
 
 variable "hyperkube_image_tag" {
   description = "The version of the hyperkube image to use."
-  default     = "v1.12.3"
+  default     = "v1.13.5"
 }
 
 variable "cluster_dns" {