From cc1e747c6976c0e4d78e43b53f453a5b43960506 Mon Sep 17 00:00:00 2001
From: jono wells <_@oj.io>
Date: Tue, 31 May 2016 12:40:19 -0700
Subject: [PATCH] removed - redundant 'PODMASTER' references

---
 io.tf            | 1 -
 modules.tf       | 1 -
 modules/s3/io.tf | 1 -
 modules/s3/s3-cp | 7 ++++++-
 modules/s3/s3.tf | 1 -
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/io.tf b/io.tf
index 1727703..ed491ca 100644
--- a/io.tf
+++ b/io.tf
@@ -34,7 +34,6 @@ variable "internal-tld" { default = "k8s" }
 variable "k8s" {
   default = {
     hyperkube-image = "gcr.io/google_containers/hyperkube:v1.2.4"
-    podmaster-image = "gcr.io/google_containers/podmaster:1.1"
     version = "v1.2.4"
   }
 }
diff --git a/modules.tf b/modules.tf
index 9544b14..7a54a8a 100644
--- a/modules.tf
+++ b/modules.tf
@@ -5,7 +5,6 @@ module "s3" {
   hyperkube-image = "${ var.k8s.hyperkube-image }"
   k8s-version = "${var.k8s.version}"
   name = "${ var.name }"
-  podmaster-image = "${ var.k8s.podmaster-image }"
   region = "${ var.aws.region }"
 }
 
diff --git a/modules/s3/io.tf b/modules/s3/io.tf
index fc1d845..0319e8b 100644
--- a/modules/s3/io.tf
+++ b/modules/s3/io.tf
@@ -2,7 +2,6 @@ variable "bucket-prefix" {}
 variable "hyperkube-image" {}
 variable "k8s-version" {}
 variable "name" {}
-variable "podmaster-image" {}
 variable "region" {}
 
 output "bucket-prefix" { value = "${ var.bucket-prefix }" }
diff --git a/modules/s3/s3-cp b/modules/s3/s3-cp
index 40f672c..5449b59 100755
--- a/modules/s3/s3-cp
+++ b/modules/s3/s3-cp
@@ -3,6 +3,12 @@
 function usage { cat <<EOF
 USAGE: $0 [bucket]
   example: $0 23234-bigbucket-us-west-1
+
+  Environment variables required: HYPERKUBE and REGION.
+  example:
+    HYPERKUBE=gcr.io/google_containers/hyperkube:v1.2.4 \
+    REGION=us-west-1 \
+    $0 23234-bigbucket-us-west-1
 EOF
   exit 1
 }
@@ -27,7 +33,6 @@ set -o pipefail
 
 # docker images
 # HYPERKUBE=${HYPERKUBE:-"gcr.io/google_containers/hyperkube:v1.2.2"}
-# PODMASTER="gcr.io/google_containers/podmaster:1.1"
 
 # directories
 CFSSL=.cfssl
diff --git a/modules/s3/s3.tf b/modules/s3/s3.tf
index e57981c..f84017b 100644
--- a/modules/s3/s3.tf
+++ b/modules/s3/s3.tf
@@ -12,7 +12,6 @@ resource "aws_s3_bucket" "ssl" {
   provisioner "local-exec" {
     command = <<EOF
       HYPERKUBE=${ var.hyperkube-image } \
-      PODMASTER=${ var.podmaster-image } \
       REGION=${ var.region } \
         ${ path.module }/s3-cp ${ var.bucket-prefix }
 EOF