Merge branch 'main' into add-workload2-role

Signed-off-by: Jorge Turrado Ferrero <[email protected]>
kedacore · Dec 30, 2023 · ef4a10a · ef4a10a
2 parents 80710f2 + 9c0175a
commit ef4a10a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -46,13 +46,13 @@ jobs:
         aws-region: eu-west-2
 
     - name: Log into GCP using OIDC
-      uses: google-github-actions/auth@v1
+      uses: google-github-actions/auth@v2
       with:
         workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
         service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
 
     - name: Setup Terraform
-      uses: hashicorp/setup-terraform@v2.0.3
+      uses: hashicorp/setup-terraform@v3.0.0
 
     - name: Terraform Init
       run: |

diff --git a/.github/workflows/pr-validation.yaml b/.github/workflows/pr-validation.yaml
@@ -48,13 +48,13 @@ jobs:
         aws-region: eu-west-2
 
     - name: Log into GCP using OIDC
-      uses: google-github-actions/auth@v1
+      uses: google-github-actions/auth@v2
       with:
         workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
         service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
 
     - name: Setup Terraform
-      uses: hashicorp/setup-terraform@v2.0.3
+      uses: hashicorp/setup-terraform@v3.0.0
 
     - name: Setup TFLint
       uses: terraform-linters/setup-tflint@v4
@@ -97,7 +97,7 @@ jobs:
       working-directory: terraform
 
     - name: Create the plan summary
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       if: always()
       id: summary
       env:

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -81,7 +81,7 @@ module "azuread_applications" {
 module "azure_aks_pr" {
   source              = "./modules/azure/aks"
   resource_group_name = var.azure_resource_group_name
-  kubernetes_version  = "1.27"
+  kubernetes_version  = "1.28"
   cluster_name        = local.pr_cluster_name
   unique_project_name = var.unique_project_name
 
@@ -103,7 +103,7 @@ module "azure_aks_pr" {
 module "azure_aks_nightly" {
   source              = "./modules/azure/aks"
   resource_group_name = var.azure_resource_group_name
-  kubernetes_version  = "1.27"
+  kubernetes_version  = "1.28"
   cluster_name        = local.main_cluster_name
   unique_project_name = var.unique_project_name
 

diff --git a/terraform/modules/aws/iam/main.tf b/terraform/modules/aws/iam/main.tf
@@ -143,6 +143,9 @@ resource "aws_iam_policy" "policy" {
                 "dynamodb:ListGlobalTables",
                 "cloudwatch:ListMetricStreams",
                 "dynamodb:DescribeReservedCapacity",
+                "secretsmanager:CreateSecret",
+                "secretsmanager:GetSecretValue",
+                "secretsmanager:DeleteSecret",
                 "kinesis:UpdateShardCount"
             ],
             "Resource": "*"
@@ -156,9 +159,9 @@ resource "aws_iam_policy" "policy" {
         },
         {
             "Effect": "Deny",
-            "Action": "sqs:*",
+            "Action": "sqs:GetQueueAttributes",
             "Resource": [
-                "arn:aws:sqs:*:589761922677:asume-role-*"
+                "arn:aws:sqs:*:589761922677:assume-role-*"
             ]
         },
         {
@@ -260,7 +263,7 @@ resource "aws_iam_policy" "workload2_role_policy" {
         {
             "Effect": "Allow",
             "Action": "sqs:*",
-            "Resource": "arn:aws:sqs:*:589761922677:asume-role-workload2-queue-*"
+            "Resource": "arn:aws:sqs:*:589761922677:assume-role-workload2-queue-*"
         }
     ]
 }

diff --git a/terraform/modules/azure/data-explorer/main.tf b/terraform/modules/azure/data-explorer/main.tf
@@ -17,6 +17,7 @@ resource "azurerm_kusto_cluster" "cluster" {
   name                = local.kusto_cluster_name
   location            = data.azurerm_resource_group.rg.location
   resource_group_name = data.azurerm_resource_group.rg.name
+  auto_stop_enabled   = false
   engine              = "V3"
 
   sku {
@@ -47,4 +48,4 @@ resource "azurerm_kusto_cluster_principal_assignment" "role" {
   principal_id   = var.admin_principal_ids[count.index]
   principal_type = "App"
   role           = "AllDatabasesAdmin"
-}
+}