Merge pull request #81 from pieterlange/feature/configurable-awscli-image

Add configuration option for AWS CLI image

Author: mumoshu

config/config.go

@@ -48,6 +48,8 @@ func newDefaultCluster() *Cluster {
 		DNSServiceIP:             "10.3.0.10",
 		K8sVer:                   "v1.4.6_coreos.0",
 		HyperkubeImageRepo:       "quay.io/coreos/hyperkube",
+		AWSCliImageRepo:          "quay.io/coreos/awscli",
+		AWSCliTag:                "master",
 		TLSCADurationDays:        365 * 10,
 		TLSCertDurationDays:      365,
 		ContainerRuntime:         "docker",
@@ -166,6 +168,8 @@ type Cluster struct {
 	DNSServiceIP             string            `yaml:"dnsServiceIP,omitempty"`
 	K8sVer                   string            `yaml:"kubernetesVersion,omitempty"`
 	HyperkubeImageRepo       string            `yaml:"hyperkubeImageRepo,omitempty"`
+	AWSCliImageRepo          string            `yaml:"awsCliImageRepo,omitempty"`
+	AWSCliTag                string            `yaml:"awsCliTag,omitempty"`
 	ContainerRuntime         string            `yaml:"containerRuntime,omitempty"`
 	KMSKeyARN                string            `yaml:"kmsKeyArn,omitempty"`
 	CreateRecordSet          bool              `yaml:"createRecordSet,omitempty"`

config/templates/cloud-config-controller

@@ -31,7 +31,7 @@ coreos:
           --volume=awsenv,kind=host,source=/etc/aws-environment,readOnly=false --mount volume=awsenv,target=/etc/aws-environment \
           --net=host \
           --trust-keys-from-https \
-          quay.io/coreos/awscli:edge -- cfn-init -v \
+          {{.AWSCliImageRepo}}:{{.AWSCliTag}} -- cfn-init -v \
               --region {{.Region}} \
               --resource LaunchConfigurationController \
               --stack {{.ClusterName}}
@@ -321,7 +321,7 @@ write_files:
         --volume=dns,kind=host,source=/etc/resolv.conf,readOnly=true --mount volume=dns,target=/etc/resolv.conf \
         --net=host \
         --trust-keys-from-https \
-        quay.io/coreos/awscli --exec=/bin/bash -- \
+        {{.AWSCliImageRepo}}:{{.AWSCliTag}} --exec=/bin/bash -- \
           -c \
           'echo decrypting tls assets; \
            for encKey in $(find /etc/kubernetes/ssl/*.pem.enc); do \

config/templates/cloud-config-etcd

@@ -117,7 +117,7 @@ write_files:
 
       for encKey in $(find /etc/etcd2/ssl/*.pem.enc);do
         tmpPath="/tmp/$(basename $encKey).tmp"
-        docker run --net host --rm -v /etc/etcd2/ssl:/etc/etcd2/ssl --rm quay.io/coreos/awscli aws --region {{.Region}} kms decrypt --ciphertext-blob fileb://$encKey --output text --query Plaintext | base64 --decode > $tmpPath
+        docker run --net host --rm -v /etc/etcd2/ssl:/etc/etcd2/ssl --rm {{.AWSCliImageRepo}}:{{.AWSCliTag}} aws --region {{.Region}} kms decrypt --ciphertext-blob fileb://$encKey --output text --query Plaintext | base64 --decode > $tmpPath
         mv  $tmpPath /etc/etcd2/ssl/$(basename $encKey .enc)
       done
 

config/templates/cloud-config-worker

@@ -196,7 +196,7 @@ coreos:
           --volume=awsenv,kind=host,source=/etc/aws-environment,readOnly=false --mount volume=awsenv,target=/etc/aws-environment \
           --net=host \
           --trust-keys-from-https \
-          quay.io/coreos/awscli:edge -- cfn-init -v \
+          {{.AWSCliImageRepo}}:{{.AWSCliTag}} -- cfn-init -v \
               --region {{.Region}} \
               --resource LaunchConfigurationWorker \
               --stack {{.ClusterName}}
@@ -298,7 +298,7 @@ write_files:
         --volume=dns,kind=host,source=/etc/resolv.conf,readOnly=true --mount volume=dns,target=/etc/resolv.conf \
         --net=host \
         --trust-keys-from-https \
-        quay.io/coreos/awscli --exec=/bin/bash -- \
+        {{.AWSCliImageRepo}}:{{.AWSCliTag}} --exec=/bin/bash -- \
           -c \
           'echo decrypting tls assets; \
            for encKey in $(find /etc/kubernetes/ssl/*.pem.enc); do \

config/templates/cluster.yaml

@@ -154,6 +154,12 @@ kmsKeyArn: "{{.KMSKeyARN}}"
 # Hyperkube image repository to use.
 # hyperkubeImageRepo: quay.io/coreos/hyperkube
 
+# AWS CLI image repository to use.
+# awsCliImageRepo: quay.io/coreos/awscli
+
+# AWS CLI image tag to use.
+# awsCliTag: master
+
 # Use Calico for network policy.
 # useCalico: false