Skip to content

Commit

Permalink
Merge pull request #10156 from DFE-Digital/fix-replace-terrafile
Browse files Browse the repository at this point in the history
Fix replace terrafile
  • Loading branch information
neillturner authored Dec 6, 2024
2 parents 474f09f + 6441a60 commit f3cce1e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,8 @@ jmeter.log
.terraform
terraform/*token*
terraform/aks/vendor/
terraform/application/vendor
terraform/custom_domains/environment_domains/vendor/
terraform/custom_domains/infrastructure/vendor/
terraform/custom_domains/environment_domains/vendor
terraform/custom_domains/infrastructure/vendor

# Key Vault secrets management script used in Makefile
bin/fetch_config.rb
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,6 @@ install-konduit: ## Install the konduit script, for accessing backend services
&& chmod +x bin/konduit.sh \
|| true

.PHONY: vendor-modules
vendor-modules:
rm -rf terraform/application/vendor/modules
git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/application/vendor/modules/aks

apply:
$(eval include global_config/apply-domain.sh)
$(eval DNS_ZONE=apply)
Expand Down Expand Up @@ -193,6 +188,11 @@ console: get-cluster-credentials ## Open a Rails console on the app instance on
$(if ${APP_NAME_SUFFIX}, $(eval APP_NAME=apply-${APP_NAME_SUFFIX}-clock-worker), $(eval APP_NAME=apply-${APP_ENV}-clock-worker))
kubectl -n ${NAMESPACE} -ti exec "deployment/${APP_NAME}" -- sh -c "cd /app && /usr/local/bin/bundle exec rails console -- --noautocomplete"

.PHONY: vendor-modules
vendor-modules:
rm -rf terraform/aks/vendor/modules
git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/aks/vendor/modules/aks

deploy-init: vendor-modules
$(if $(or $(IMAGE_TAG), $(NO_IMAGE_TAG_DEFAULT)), , $(eval export IMAGE_TAG=main))
$(if $(IMAGE_TAG), , $(error Missing environment variable "IMAGE_TAG"))
Expand Down

0 comments on commit f3cce1e

Please sign in to comment.