Sync Terraform & Helm changes

GitOrigin-RevId: 0ee63a1936abd488fd236589033cfec1ce396214
aptos-labs · Jul 20, 2024 · 8e510c6 · 8e510c6
1 parent 4d7d8d3
commit 8e510c6
Show file tree

Hide file tree

Showing 29 changed files with 276 additions and 234 deletions.
diff --git a/terraform/aptos-node/aws/versions.tf b/terraform/aptos-node/aws/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/terraform/aptos-node/azure/versions.tf b/terraform/aptos-node/azure/versions.tf
@@ -1,7 +1,7 @@
 provider "azuread" {}
 
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     azuread = {
       source  = "hashicorp/azuread"

diff --git a/terraform/aptos-node/gcp/versions.tf b/terraform/aptos-node/gcp/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     google = {
       source  = "hashicorp/google"

diff --git a/terraform/fullnode/aws/auth.tf b/terraform/fullnode/aws/auth.tf
@@ -153,14 +153,8 @@ data "aws_iam_policy_document" "alb-ingress" {
   }
 }
 
-resource "aws_iam_openid_connect_provider" "cluster" {
-  client_id_list  = ["sts.amazonaws.com"]
-  thumbprint_list = ["9e99a48a9960b14926bb7f3b02e22da2b0ab7280"] # Thumbprint of Root CA for EKS OIDC, Valid until 2037
-  url             = data.aws_eks_cluster.aptos.identity[0].oidc[0].issuer
-}
-
 locals {
-  oidc_provider = replace(aws_iam_openid_connect_provider.cluster.url, "https://", "")
+  oidc_provider = module.eks.oidc_provider
 }
 
 data "aws_iam_policy_document" "k8s-aws-integrations-assume-role" {

diff --git a/terraform/fullnode/aws/backup.tf b/terraform/fullnode/aws/backup.tf
@@ -49,9 +49,16 @@ data "aws_iam_policy_document" "backup-assume-role" {
 data "aws_iam_policy_document" "backup" {
   statement {
     actions = [
-      "s3:GetObject",
       "s3:ListBucket",
       "s3:PutObject",
+      "s3:GetObject",
+      "s3:GetObjectTagging",
+      "s3:DeleteObject",
+      "s3:DeleteObjectVersion",
+      "s3:GetObjectVersion",
+      "s3:GetObjectVersionTagging",
+      "s3:GetObjectACL",
+      "s3:PutObjectACL"
     ]
     resources = [
       "arn:aws:s3:::${aws_s3_bucket.backup.id}",

diff --git a/terraform/fullnode/aws/versions.tf b/terraform/fullnode/aws/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     aws = {
       source  = "hashicorp/aws"

diff --git a/terraform/fullnode/gcp/versions.tf b/terraform/fullnode/gcp/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5.6"
+  required_version = "~> 1.9.1"
   required_providers {
     google = {
       source  = "hashicorp/google"