Skip to content

Commit b5b31f8

Browse files
authored
Merge pull request #18 from khanh-ph/release/1.2.0
Release version 1.2.0
2 parents d713bb5 + 8a98aa6 commit b5b31f8

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.github/workflows/publish-a-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
target_commitish: ${{ github.event.pull_request.merge_commit_sha }}
3737
tag_name: ${{ env.RELEASE_VERSION }}
38-
name: ${{ env.RELEASE_VERSION }}
38+
name: v${{ env.RELEASE_VERSION }}
3939
draft: false
4040
prerelease: false
4141

Makefile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fmt: $(modules:%=%/fmt)
1313
@cd $* && terraform fmt
1414

1515
init:
16-
@terraform init
16+
@terraform init -input=false
1717

1818
test: init $(modules:%=%/fmt_check)
1919
@terraform fmt -check
@@ -23,19 +23,16 @@ test: init $(modules:%=%/fmt_check)
2323
@cd $* && terraform fmt -check
2424

2525
plan: test
26-
@terraform plan
26+
@terraform plan -input=false
2727

2828
destroy:
2929
@terraform destroy
3030

3131
infra: test
32-
@terraform apply --auto-approve -var ks_tmp=$(ks_tmp)
32+
@terraform apply -input=false --auto-approve -var ks_tmp=$(ks_tmp)
3333

34-
ks_img:
34+
k8s:
3535
@docker pull $(ks_img)
36-
37-
k8s: ks_img
38-
@echo ${TF_VAR_base64_ansible_private_key} | base64 --decode > $(ks_tmp)/id_rsa
3936
@sudo chmod 600 $(ks_tmp)/id_rsa
4037
@docker run --rm -it \
4138
--mount type=bind,source="${ks_tmp_abspath}/inventory.ini",dst=/inventory/sample/inventory.ini \
@@ -50,7 +47,7 @@ cluster: infra k8s clean
5047
clean: $(needs_cleanup:%=%/clean)
5148

5249
%/clean:
53-
@rm -rf $*
50+
@sudo rm -rf $*
5451

55-
.PHONY: fmt init test plan destroy infra kubespray_image k8s cluster clean
52+
.PHONY: fmt init test plan destroy infra k8s cluster clean
5653
.PHONY: %/fmt %/fmt_check %/clean

0 commit comments

Comments
 (0)