Skip to content

Commit

Permalink
upgrade to terraform v0.14.5
Browse files Browse the repository at this point in the history
  • Loading branch information
mingfang committed Jan 24, 2021
1 parent 4d97ed3 commit ef80ea2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ENV GO111MODULE=on
# XC_OS=linux XC_ARCH=amd64 make bin
#RUN mv /go/bin/terraform /usr/local/bin/terraform

RUN wget https://releases.hashicorp.com/terraform/0.13.5/terraform_0.13.5_linux_amd64.zip && \
RUN wget https://releases.hashicorp.com/terraform/0.14.5/terraform_0.14.5_linux_amd64.zip && \
unzip *.zip && \
mv terraform /usr/local/bin && \
rm *.zip
Expand Down
1 change: 1 addition & 0 deletions dev
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ docker build --pull --target dev --tag "${IMAGE}:dev" $@ .

docker run --rm -p 8000:8000 \
-e KUBECONFIG=/kubeconfig \
-e TF_CLI_CONFIG_FILE=/go/src/github.com/mingfang/terraform-provider-k8s/dev.tfrc \
-v /mnt/ceph/docker-kubernetes-master/vault-data/cluster-admin-kubeconfig.yml:/kubeconfig \
-v `pwd`:/go/src/github.com/mingfang/terraform-provider-k8s \
-v `pwd`/../terraform-k8s-modules:/go/src/github.com/mingfang/terraform-provider-k8s/modules \
Expand Down
8 changes: 8 additions & 0 deletions dev.tfrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
provider_installation {

dev_overrides {
"mingfang/k8s" = "/root/.terraform.d/plugins/mingfang/k8s/0.0.0/linux_amd64"
}

direct {}
}
8 changes: 5 additions & 3 deletions make
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
clear
rm /usr/local/bin/terraform-provider-k8s*
go build -o /usr/local/bin/terraform-provider-k8s_v1.0.0
ln -s -f /usr/local/bin/terraform-provider-k8s_v1.0.0 /go/bin/terraform-provider-k8s_v1.0.0
rm -r ~/.terraform.d
DIR=~/.terraform.d/plugins/mingfang/k8s/0.0.0/linux_amd64
mkdir -p $DIR

go build -o $DIR/terraform-provider-k8s
terraform init

0 comments on commit ef80ea2

Please sign in to comment.