Merge pull request kubernetes-retired#386 from MohGeek/update-terrafo…

…rm-0-9-4 Update terraform to 0.9.4
timmeade · May 19, 2017 · 4260b3a · 4260b3a
2 parents 823eb32 + 0c736e3
commit 4260b3a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/phase1/gce/gce.jsonnet b/phase1/gce/gce.jsonnet
@@ -209,5 +209,4 @@ function(cfg)
         },
       },
     } + tf.pki.cluster_tls_resources(p1.cluster_name, [names.master_instance], ["${google_compute_address.%(master_ip)s.address}" % names]),
-    data: tf.pki.cluster_tls_data(p1.cluster_name, [names.master_instance], ["${google_compute_address.%(master_ip)s.address}" % names]),
   }
diff --git a/phase1/tf.jsonnet b/phase1/tf.jsonnet
@@ -32,7 +32,7 @@
       ],
     },
     tls_locally_signed_cert(name, signer): {
-      cert_request_pem: "${data.tls_cert_request.%s.cert_request_pem}" % name,
+      cert_request_pem: "${tls_cert_request.%s.cert_request_pem}" % name,
       ca_key_algorithm: "${tls_private_key.%s.algorithm}" % signer,
       ca_private_key_pem: "${tls_private_key.%s.private_key_pem}" % signer,
       ca_cert_pem: "${tls_self_signed_cert.%s.cert_pem}" % signer,
@@ -75,7 +75,18 @@
     // ip addresses will cause all certs to be recreated tainting clusters using the
     // old certificates (i.e. causing those clusters to be recreated by terraform).
 
-    cluster_tls_data(cluster_name, master_instance_names, master_instance_ips):: {
+    cluster_tls_resources(cluster_name, master_instance_names, master_instance_ips):: {
+      tls_private_key: {
+        [cluster_name + "-" + name]: pki.private_key
+        for name in ["root", "node", "master", "admin"]
+      },
+      tls_self_signed_cert: {
+        [cluster_name + "-root"]: pki.tls_self_signed_cert(cluster_name + "-root"),
+      },
+      tls_locally_signed_cert: {
+        [cluster_name + "-" + name]: pki.tls_locally_signed_cert(cluster_name + "-" + name, cluster_name + "-root")
+        for name in ["node", "master", "admin"]
+      },
       tls_cert_request: {
         [cluster_name + "-" + name]: pki.tls_cert_request(cluster_name + "-" + name)
         for name in ["node", "admin"]
@@ -99,22 +110,7 @@
       },
     },
 
-    cluster_tls_resources(cluster_name, master_instance_names, master_instance_ips):: {
-      tls_private_key: {
-        [cluster_name + "-" + name]: pki.private_key
-        for name in ["root", "node", "master", "admin"]
-      },
-      tls_self_signed_cert: {
-        [cluster_name + "-root"]: pki.tls_self_signed_cert(cluster_name + "-root"),
-      },
-      tls_locally_signed_cert: {
-        [cluster_name + "-" + name]: pki.tls_locally_signed_cert(cluster_name + "-" + name, cluster_name + "-root")
-        for name in ["node", "master", "admin"]
-      },
-    },
-
     cluster_tls(cluster_name, master_instance_names, master_instance_ips):: {
-      data: pki.cluster_tls_data(cluster_name, master_instance_names, master_instance_ips),
       resource: pki.cluster_tls_resources(cluster_name, master_instance_names, master_instance_ips),
     },
   },

diff --git a/util/docker-build.sh b/util/docker-build.sh
@@ -17,8 +17,7 @@ cp jsonnet /usr/local/bin)
 rm -rf /tmp/jsonnet
 
 ## Install Terraform
-export TERRAFORM_VERSION=0.7.2
-export TERRAFORM_SHA256SUM=b337c885526a8a653075551ac5363a09925ce9cf141f4e9a0d9f497842c85ad5
+export TERRAFORM_VERSION=0.9.4
 
 mkdir -p /tmp/terraform/
 (cd /tmp/terraform
-Original file line number
+Diff line change
@@ Expand Up / @@ -209,5 +209,4 @@ function(cfg) @@
             },
           },
         } + tf.pki.cluster_tls_resources(p1.cluster_name, [names.master_instance], ["${google_compute_address.%(master_ip)s.address}" % names]),
-        data: tf.pki.cluster_tls_data(p1.cluster_name, [names.master_instance], ["${google_compute_address.%(master_ip)s.address}" % names]),
       }