Skip to content
This repository was archived by the owner on Mar 24, 2023. It is now read-only.

Commit d27319b

Browse files
laveryalaverya
authored
Merge pull request #943 from laverya/update-terraform
Update terraform
2 parents a6c7902 + 14a46b4 commit d27319b

File tree

14 files changed

+132
-26
lines changed

14 files changed

+132
-26
lines changed

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
1717
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
1818
apt-get install -y nodejs
1919

20-
ENV TERRAFORM_VERSION=0.11.13
20+
ENV TERRAFORM_VERSION=0.11.14
2121
ENV TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
2222
ENV TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
23-
ENV TERRAFORM_SHA256SUM=5925cd4d81e7d8f42a0054df2aafd66e2ab7408dbed2bd748f0022cfe592f8d2
23+
ENV TERRAFORM_SHA256SUM=9b9a4492738c69077b079e595f5b2a9ef1bc4e8fb5596610f69a6f322a8af8dd
2424

2525
RUN curl -fsSLO "$TERRAFORM_URL" \
2626
&& echo "${TERRAFORM_SHA256SUM} ${TERRAFORM_ZIP}" | sha256sum -c - \

‎Gopkg.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

+4
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ ignored = [
5353
name = "github.com/spf13/viper"
5454
version = "1.2.1"
5555

56+
[[constraint]]
57+
name = "github.com/hashicorp/terraform"
58+
version = "0.11.14"
59+
5660
[[constraint]]
5761
name = "github.com/mholt/archiver"
5862
revision = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3"

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ VERSION ?=`git describe --tags`
1515
DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
1616
HELMV = v2.13.0
1717
KUSTOMIZEV = v2.0.3
18-
TERRAFORMV = v0.11.13
18+
TERRAFORMV = v0.11.14
1919

2020
GIT_TREE = $(shell git rev-parse --is-inside-work-tree 2>/dev/null)
2121
ifneq "$(GIT_TREE)" ""

‎deploy/.goreleaser.unstable.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ builds:
2929
-X github.com/replicatedhq/ship/pkg/version.buildTime={{.Date}}
3030
-X github.com/replicatedhq/ship/pkg/version.helm=v2.13.0
3131
-X github.com/replicatedhq/ship/pkg/version.kustomize=v2.0.3
32-
-X github.com/replicatedhq/ship/pkg/version.terraform=v0.11.13
32+
-X github.com/replicatedhq/ship/pkg/version.terraform=v0.11.14
3333
-extldflags "-static"
3434
flags: -tags netgo -installsuffix netgo
3535
binary: ship

‎deploy/.goreleaser.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ builds:
2929
-X github.com/replicatedhq/ship/pkg/version.buildTime={{.Date}}
3030
-X github.com/replicatedhq/ship/pkg/version.helm=v2.13.0
3131
-X github.com/replicatedhq/ship/pkg/version.kustomize=v2.0.3
32-
-X github.com/replicatedhq/ship/pkg/version.terraform=v0.11.13
32+
-X github.com/replicatedhq/ship/pkg/version.terraform=v0.11.14
3333
-extldflags "-static"
3434
flags: -tags netgo -installsuffix netgo
3535
binary: ship

‎deploy/Dockerfile-full

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
ARG source_tag=slim
22
FROM replicated/ship:${source_tag}
33

4-
ENV TERRAFORM_VERSION=0.11.13
4+
ENV TERRAFORM_VERSION=0.11.14
55
ENV TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
66
ENV TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
7-
ENV TERRAFORM_SHA256SUM=5925cd4d81e7d8f42a0054df2aafd66e2ab7408dbed2bd748f0022cfe592f8d2
7+
ENV TERRAFORM_SHA256SUM=9b9a4492738c69077b079e595f5b2a9ef1bc4e8fb5596610f69a6f322a8af8dd
88

99
RUN curl -fsSLO "$TERRAFORM_URL" \
1010
&& echo "${TERRAFORM_SHA256SUM} ${TERRAFORM_ZIP}" | sha256sum -c - \

‎hack/get_run_deps.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# used in circle
55
set -ex
66

7-
TERRAFORM_VERSION=0.11.13
7+
TERRAFORM_VERSION=0.11.14
88
TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
99
TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
10-
TERRAFORM_SHA256SUM=5925cd4d81e7d8f42a0054df2aafd66e2ab7408dbed2bd748f0022cfe592f8d2
10+
TERRAFORM_SHA256SUM=9b9a4492738c69077b079e595f5b2a9ef1bc4e8fb5596610f69a6f322a8af8dd
1111

1212
KUBECTL_VERSION=v1.11.1
1313
KUBECTL_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl

‎integration/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ ENV GOPATH=/go
44

55
RUN apk update && apk add ca-certificates curl git build-base
66

7-
ENV TERRAFORM_VERSION=0.11.13
7+
ENV TERRAFORM_VERSION=0.11.14
88
ENV TERRAFORM_URL="https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
99
ENV TERRAFORM_ZIP="terraform_${TERRAFORM_VERSION}_linux_amd64.zip"
10-
ENV TERRAFORM_SHA256SUM=5925cd4d81e7d8f42a0054df2aafd66e2ab7408dbed2bd748f0022cfe592f8d2
10+
ENV TERRAFORM_SHA256SUM=9b9a4492738c69077b079e595f5b2a9ef1bc4e8fb5596610f69a6f322a8af8dd
1111

1212
RUN curl -fsSLO "$TERRAFORM_URL" \
1313
&& echo "${TERRAFORM_SHA256SUM} ${TERRAFORM_ZIP}" | sha256sum -c - \

‎integration/base/terraform/expected/.ship/state.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"id_length": "1"
55
},
66
"terraform": {
7-
"rawState": "{\n \"version\": 3,\n \"terraform_version\": \"0.11.13\",\n \"serial\": 5,\n \"lineage\": \"9c4547a4-c042-5ef9-01de-12509401b810\",\n \"modules\": [\n {\n \"path\": [\n \"root\"\n ],\n \"outputs\": {},\n \"resources\": {\n \"local_file.foo\": {\n \"type\": \"local_file\",\n \"depends_on\": [],\n \"primary\": {\n \"id\": \"356a192b7913b04c54574d18c28d46e6395428ab\",\n \"attributes\": {\n \"content\": \"1\",\n \"filename\": \"/tmp/foo.bar\",\n \"id\": \"356a192b7913b04c54574d18c28d46e6395428ab\"\n },\n \"meta\": {},\n \"tainted\": false\n },\n \"deposed\": [],\n \"provider\": \"provider.local\"\n }\n },\n \"depends_on\": []\n }\n ]\n}\n",
7+
"rawState": "{\n \"version\": 3,\n \"terraform_version\": \"0.11.14\",\n \"serial\": 5,\n \"lineage\": \"9c4547a4-c042-5ef9-01de-12509401b810\",\n \"modules\": [\n {\n \"path\": [\n \"root\"\n ],\n \"outputs\": {},\n \"resources\": {\n \"local_file.foo\": {\n \"type\": \"local_file\",\n \"depends_on\": [],\n \"primary\": {\n \"id\": \"356a192b7913b04c54574d18c28d46e6395428ab\",\n \"attributes\": {\n \"content\": \"1\",\n \"filename\": \"/tmp/foo.bar\",\n \"id\": \"356a192b7913b04c54574d18c28d46e6395428ab\"\n },\n \"meta\": {},\n \"tainted\": false\n },\n \"deposed\": [],\n \"provider\": \"provider.local\"\n }\n },\n \"depends_on\": []\n }\n ]\n}\n",
88
"state": {
99
"version": 3,
10-
"terraform_version": "0.11.13",
10+
"terraform_version": "0.11.14",
1111
"serial": 5,
1212
"lineage": "9c4547a4-c042-5ef9-01de-12509401b810",
1313
"modules": [

‎integration/base/terraform/expected/installer/terraform/terraform.tfstate

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"version": 3,
3-
"terraform_version": "0.11.13",
3+
"terraform_version": "0.11.14",
44
"serial": 5,
55
"lineage": "9c4547a4-c042-5ef9-01de-12509401b810",
66
"modules": [

‎vendor/github.com/hashicorp/terraform/config/module/storage.go

+11-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hashicorp/terraform/terraform/state.go

+99-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/hashicorp/terraform/version/version.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)