diff --git a/gcp/docker-compose.yaml b/gcp/docker-compose.yaml index d81c9559..afe55ed3 100644 --- a/gcp/docker-compose.yaml +++ b/gcp/docker-compose.yaml @@ -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 @@ -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: diff --git a/shared/rakefiles/entrypoint.rake b/shared/rakefiles/entrypoint.rake index 5bc79772..d0a0fa63 100644 --- a/shared/rakefiles/entrypoint.rake +++ b/shared/rakefiles/entrypoint.rake @@ -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 @@ -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']"