Skip to content

Bump Terraform from 0.11.7 to 0.11.8 #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2018
Merged

Bump Terraform from 0.11.7 to 0.11.8 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0032348
Bump Terraform from 0.11.7 to 0.11.8
wking Sep 6, 2018
856350d
hack/tf-fmt: Add a workaround for origin/release's hardcoding v0.11.7
wking Sep 14, 2018
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 WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
workspace(name = "installer")

terrafom_version = "0.11.7"
terrafom_version = "0.11.8"

supported_platforms = [
"linux",
Expand Down
4 changes: 2 additions & 2 deletions hack/tf-fmt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ if [ "$IS_CONTAINER" != "" ]; then
set -- -list -check -write=false
fi
set -x
/terraform fmt "${@}"
/terraform fmt "${@}" # FIXME: drop this slash after we update openshift/release
else
podman run --rm \
--env IS_CONTAINER=TRUE \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Above, in #L6, please update /terraform to terraform i've pushed an 11.8 terraform image using the change you made to the build script-adding terraform binary to PATH, so now you terraform fmt... no leading slash.
You can verify image is available, docker pull quay.io/coreos/terraform-alpine:v0.11.8 or you can run ./hack/tf-fmt.sh from installer dir to verify all is working well (I did, it is 👍 ).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Above, in #L6, please update /terraform to terraform...

Done and rebased onto master with 59af76b -> 0032348.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Above, in #L6, please update /terraform to terraform...

It turns out that I can't actually do that until openshift/release bumps its image to v0.11.8. I've filed openshift/release#1515 with that bump, and put a temporary fixup 856350d here. Going forward, we'll want to:

  1. Land this PR.
  2. Land Bump Terraform from 0.11.7 to 0.11.8 release#1515.
  3. Revert 856350d.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack yup i missed that

--volume "${PWD}:${PWD}:z" \
--workdir "${PWD}" \
quay.io/coreos/terraform-alpine:v0.11.7 \
quay.io/coreos/terraform-alpine:v0.11.8 \
./hack/tf-fmt.sh
fi
2 changes: 1 addition & 1 deletion images/tectonic-installer/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM openshift/origin-release:golang-1.10 as build
WORKDIR /go/src/github.com/openshift/installer
COPY . .
### Install Terraform
ENV TERRAFORM_VERSION="0.11.1"
ENV TERRAFORM_VERSION="0.11.8"
ARG TERRAFORM_URL=https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip

RUN go build -o ./installer/tectonic ./installer/cmd/tectonic && \
Expand Down