Merge pull request #574 from pbx0/script

add conformance script shim for terraform setup

Author: Patrick Baxter

hack/terraform-quickstart/main.tf

@@ -6,37 +6,52 @@ provider "aws" {
 
 resource "aws_instance" "bootstrap_node" {
   ami                  = "${data.aws_ami.coreos_ami.image_id}"
-  instance_type        = "m3.medium"
+  instance_type        = "${var.instance_type}"
   key_name             = "${var.ssh_key}"
   iam_instance_profile = "${aws_iam_instance_profile.bk_profile.id}"
 
   tags {
     Name = "${var.instance_tags}"
   }
+
+  root_block_device {
+    volume_type = "gp2"
+    volume_size = "30"
+  }
 }
 
 resource "aws_instance" "worker_node" {
   ami                  = "${data.aws_ami.coreos_ami.image_id}"
-  instance_type        = "m3.medium"
+  instance_type        = "${var.instance_type}"
   key_name             = "${var.ssh_key}"
   count                = "${var.num_workers}"
   iam_instance_profile = "${aws_iam_instance_profile.bk_profile.id}"
 
   tags {
     Name = "${var.instance_tags}"
   }
+
+  root_block_device {
+    volume_type = "gp2"
+    volume_size = "30"
+  }
 }
 
 resource "aws_instance" "master_node" {
   ami                  = "${data.aws_ami.coreos_ami.image_id}"
-  instance_type        = "m3.medium"
+  instance_type        = "${var.instance_type}"
   key_name             = "${var.ssh_key}"
   count                = "${var.additional_masters}"
   iam_instance_profile = "${aws_iam_instance_profile.bk_profile.id}"
 
   tags {
     Name = "${var.instance_tags}"
   }
+
+  root_block_device {
+    volume_type = "gp2"
+    volume_size = "30"
+  }
 }
 
 data "aws_ami" "coreos_ami" {

hack/terraform-quickstart/run-conformance.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -euo pipefail
+
+# This is a small shim to run the conformance runner script in
+# /hack/tests/conformance-test.sh. More option defaults such as
+# CONFORMANCE_VERSION are set in that script. If the SSH key you use to
+# access the nodes setup by terraform is not available via the ssh agent then
+# you must specify which keyfile to use.
+
+export BOOTSTRAP_IP=`terraform output bootstrap_node_ip`
+export KUBECONFIG=/etc/kubernetes/kubeconfig
+export SSH_KEY_FILE=${SSH_KEY_FILE:-/fake/keyfile/have/agent}
+
+cd ../tests
+./conformance-test.sh $BOOTSTRAP_IP 22 ${SSH_KEY_FILE}
+

hack/terraform-quickstart/start-cluster.sh

@@ -6,7 +6,17 @@ export WORKER_IPS=`terraform output -json worker_ips | jq -r '.value[]'`
 export MASTER_IPS=`terraform output -json master_ips | jq -r '.value[]'`
 export SELF_HOST_ETCD=`terraform output self_host_etcd`
 export SSH_OPTS=${SSH_OPTS:-}" -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-export CLOUD_PROVIDER=aws
+export CLOUD_PROVIDER=${CLOUD_PROVIDER:-aws}
+
+# Normally we want to default to aws here since that is all terraform
+# supports and it is required for the e2e tests. However because of an
+# upstream bug, conformance tests won't pass with cloud provider integration
+# set to aws. So we need a knob to set the CLOUD_PROVIDER to nothing while
+# keeping aws as the default as to not mess up people using the e2e tests. 
+if [ "$CLOUD_PROVIDER" == "none" ] ; then
+	echo "cloud provider integration disabled"
+	CLOUD_PROVIDER=
+fi
 
 cd ../quickstart
 ./init-master.sh $BOOTSTRAP_IP

hack/terraform-quickstart/variables.tf

@@ -16,6 +16,12 @@ variable "instance_tags" {
   type        = "string"
 }
 
+variable "instance_type" {
+  description = "Name all instances behind a single tag based on who/what is running terraform"
+  type        = "string"
+  default     = "m3.medium"
+}
+
 variable "self_host_etcd" {
   type    = "string"
   default = "true"

hack/tests/conformance-test.sh

@@ -22,7 +22,7 @@ ssh_key=$3
 
 KUBECONFIG=${KUBECONFIG:-/home/core/cluster/auth/kubeconfig}
 K8S_SRC=/home/core/go/src/k8s.io/kubernetes
-ssh -q -o stricthostkeychecking=no -i ${ssh_key} -p ${ssh_port} core@${ssh_host} \
+ssh -q -o UserKnownHostsFile=/dev/null -o stricthostkeychecking=no -i ${ssh_key} -p ${ssh_port} core@${ssh_host} \
     "mkdir -p ${K8S_SRC} && [[ -d ${K8S_SRC}/.git ]] || git clone https://${CONFORMANCE_REPO} ${K8S_SRC}"
 
 RKT_OPTS="\
@@ -45,4 +45,4 @@ CONFORMANCE="\
  -v --test -check_version_skew=false --test_args='--ginkgo.focus=\[Conformance\]'"
 
 CMD="sudo rkt run --insecure-options=image ${RKT_OPTS} docker://golang:1.7.5 --exec /bin/bash -- -c \"${INIT} && ${BUILD} && ${CONFORMANCE}\""
-ssh -q -o stricthostkeychecking=no -i ${ssh_key} -p ${ssh_port} core@${ssh_host} "${CMD}"
+ssh -q  -o UserKnownHostsFile=/dev/null -o stricthostkeychecking=no -i ${ssh_key} -p ${ssh_port} core@${ssh_host} "${CMD}"