Skip to content
This repository has been archived by the owner on Sep 21, 2020. It is now read-only.

Commit

Permalink
Merge pull request #166 from stepanstipl/GPII-3428-remove-terragrunt-…
Browse files Browse the repository at this point in the history
…volume

GPII-3428 Remove terragrunt volume
  • Loading branch information
stepanstipl authored Oct 9, 2018
2 parents 18d76f5 + 8937156 commit 934c48a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 0 additions & 3 deletions gcp/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ services:
- ../shared/rakefiles:/rakefiles
- secrets:/project/live/${ENV}/secrets
- helm:/root/.helm
- terragrunt:/root/.terragrunt
- gcloud:/root/.config/gcloud
- kube:/root/.kube

Expand All @@ -63,8 +62,6 @@ volumes:
name: ${TF_VAR_project_id}-${USER}-secrets
helm:
name: ${TF_VAR_project_id}-${USER}-helm
terragrunt:
name: ${TF_VAR_project_id}-${USER}-terragrunt
gcloud:
name: ${TF_VAR_project_id}-${USER}-gcloud
kube:
Expand Down
3 changes: 1 addition & 2 deletions shared/rakefiles/entrypoint.rake
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ end
@serviceaccount_key_file = "secrets/kube-system/owner.json"

task :clean_volumes => :set_vars do
["helm", "terragrunt", "kube"].each do |app|
["helm", "kube"].each do |app|
sh "docker volume rm -f -- #{ENV["TF_VAR_project_id"]}-#{ENV["USER"]}-#{app}"
end
end
Expand Down Expand Up @@ -174,7 +174,6 @@ task :destroy_tfstate, [:prefix] => [:set_vars, :check_destroy_allowed] do |task
prefix = args[:prefix]
end
sh "#{@exekube_cmd} sh -c 'gsutil rm -r gs://#{ENV["TF_VAR_project_id"]}-tfstate/#{@env}/#{prefix}'"
sh "docker volume rm -f -- #{ENV["TF_VAR_project_id"]}-#{ENV["USER"]}-terragrunt"
end

desc "[ADVANCED] Destroy provided module in the cluster, and then deploy it -- rake redeploy_module['k8s/kube-system/cert-manager']"
Expand Down

0 comments on commit 934c48a

Please sign in to comment.