Skip to content
This repository was archived by the owner on Feb 5, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/dev/gcp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Use this guide to manually install a Tectonic cluster on a GCP account.

## Prerequsities

- **Terraform:** >= v0.10.4
- **Terraform:** >= v0.10.7
- **DNS**: Ensure that the DNS zone is already created and available in [Cloud DNS](https://console.cloud.google.com/net-services/dns) for the account. For example if the `tectonic_base_domain` is set to `kube.example.com` a Cloud DNS zone must exist with the nameservers configured for that domain.
Tectonic Account: Register for a Tectonic Account, which is free for up to 10 nodes. You must provide the cluster license and pull secret during installation.
- **Tectonic Account** - Register for a [Tectonic Account](https://coreos.com/tectonic), which is free for up to 10 nodes. You must provide the cluster license and pull secret during installation.
Expand Down
2 changes: 1 addition & 1 deletion config.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.10.4"
required_version = ">= 0.10.7"
}

provider "archive" {
Expand Down
4 changes: 2 additions & 2 deletions images/tectonic-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN chmod 777 -R /go

### Install Shellcheck, Terraform, NodeJS and Yarn
ENV SHELLCHECK_VERSION="v0.4.6"
ENV TERRAFORM_VERSION="v0.10.4-coreos.1"
ENV TERRAFORM_VERSION="v0.10.7"
ENV NODE_VERSION="v8.1.2"
ENV YARN_VERSION="v0.24.6"
ENV MATCHBOXVERSION="v0.6.1"
Expand All @@ -59,7 +59,7 @@ RUN apt-get update && \
# Install Terraform
# TERRAFORM_URL enables us to build the upstream-terraform Tectonic builder
# image (See README.md/##Upstream-and-CoreOS-Terraform)
ARG TERRAFORM_URL=https://github.com/coreos/terraform/releases/download/${TERRAFORM_VERSION}/linux_amd64.zip
ARG TERRAFORM_URL=https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
RUN curl -L ${TERRAFORM_URL} | funzip > /usr/local/bin/terraform && chmod +x /usr/local/bin/terraform

# Install NodeJS
Expand Down
2 changes: 1 addition & 1 deletion images/tectonic-installer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.9.0-stretch

ENV TERRAFORM_VERSION="0.10.4"
ENV TERRAFORM_VERSION="0.10.7"

RUN apt-get update \
&& apt-get install --no-install-recommends -y -q \
Expand Down
4 changes: 2 additions & 2 deletions images/tectonic-smoke-test-env/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ruby:2.4-slim

ENV TERRAFORM_VERSION="v0.10.4-coreos.1"
ENV TERRAFORM_VERSION="v0.10.7"

COPY ./tests/rspec/Gemfile* /tmp/app/

Expand All @@ -17,7 +17,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s
mv ./kubectl /bin/kubectl

# Install Terraform
RUN curl -L https://github.com/coreos/terraform/releases/download/${TERRAFORM_VERSION}/linux_amd64.zip | funzip > /usr/local/bin/terraform && chmod +x /usr/local/bin/terraform
RUN curl -L https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip | funzip > /usr/local/bin/terraform && chmod +x /usr/local/bin/terraform

# Install Chrome for installer gui tests
# Use Chrome beta because v60 or higher is needed for headless mode
Expand Down
2 changes: 1 addition & 1 deletion tests/smoke/bare-metal/smoke.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ BIN_DIR="$ROOT/bin_test"

MATCHBOX_VERSION=v0.6.1
KUBECTL_VERSION=v1.6.4
TERRAFORM_VERSION=0.10.4
TERRAFORM_VERSION=0.10.7

KUBECTL_URL="https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl"
TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
Expand Down