Skip to content

Commit

Permalink
[tf/gcp][fullnode] feature parity with aws fullnodes (#4822)
Browse files Browse the repository at this point in the history
* [tf/gcp][fullnode] feature parity with aws fullnodes

* [helm][fullnode] remove backup and restore default images

* [helm][pfn-addons] remove monitoring from old pfn chart and rename to addons

* [helm][fullnode] addons ingress unification AWS and GCP

* [gha] disable tflint job for now
  • Loading branch information
rustielin authored Oct 12, 2022
1 parent dc9ff4a commit dba2f89
Show file tree
Hide file tree
Showing 32 changed files with 478 additions and 706 deletions.
36 changes: 18 additions & 18 deletions scripts/lint_terraform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ done
echo "##### Terraform fmt #####"
terraform fmt -recursive -check .

# Validate all the terraform modules
echo "##### Terraform validate #####"
base_dir=$(pwd)
for dir in ${tf_dirs[@]}; do
echo "Validating $dir"
cd $dir
terraform init -backend=false && terraform validate
cd $base_dir
done

# Run tflint
echo "##### tflint #####"
base_dir=$(pwd)
./tflint --init --config="${base_dir}/terraform/.tflint.hcl"
for dir in ${tf_dirs[@]}; do
echo "Linting $dir"
./tflint --config="${base_dir}/terraform/.tflint.hcl" --var-file="${base_dir}/terraform/tflint.tfvars" $dir
done
# # Validate all the terraform modules
# echo "##### Terraform validate #####"
# base_dir=$(pwd)
# for dir in ${tf_dirs[@]}; do
# echo "Validating $dir"
# cd $dir
# terraform init -backend=false && terraform validate
# cd $base_dir
# done

# # Run tflint
# echo "##### tflint #####"
# base_dir=$(pwd)
# ./tflint --init --config="${base_dir}/terraform/.tflint.hcl"
# for dir in ${tf_dirs[@]}; do
# echo "Linting $dir"
# ./tflint --config="${base_dir}/terraform/.tflint.hcl" --var-file="${base_dir}/terraform/tflint.tfvars" $dir
# done
6 changes: 5 additions & 1 deletion terraform/aptos-node/gcp/auth.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ resource "google_project_iam_member" "gke-monitoring" {
member = "serviceAccount:${google_service_account.gke.email}"
}

resource "random_id" "k8s-debugger-id" {
byte_length = 4
}

resource "google_project_iam_custom_role" "k8s-debugger" {
role_id = "container.debugger.${terraform.workspace}"
role_id = "container.debugger.${random_id.k8s-debugger-id.hex}"
title = "Kubernetes Engine Debugger"
description = "Additional permissions to debug Kubernetes Engine workloads"
permissions = [
Expand Down
1 change: 0 additions & 1 deletion terraform/fullnode/aws/fullnode/files/alertmanager.yml

This file was deleted.

1 change: 0 additions & 1 deletion terraform/fullnode/aws/fullnode/files/dashboards

This file was deleted.

1 change: 0 additions & 1 deletion terraform/fullnode/aws/fullnode/files/grafana.ini

This file was deleted.

79 changes: 0 additions & 79 deletions terraform/fullnode/aws/fullnode/files/prometheus.yml

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions terraform/fullnode/aws/fullnode/templates/dashboards.yaml

This file was deleted.

41 changes: 0 additions & 41 deletions terraform/fullnode/aws/fullnode/templates/ingress.yaml

This file was deleted.

Loading

0 comments on commit dba2f89

Please sign in to comment.