Merge pull request #35 from using-system/features/20240305

Features/20240305
using-system · Mar 5, 2024 · 7aacf94 · 7aacf94
2 parents 308aa99 + 4db15b8
commit 7aacf94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/tf-modules-validation.yml b/.github/workflows/tf-modules-validation.yml
@@ -1,4 +1,4 @@
-name: TF Modules - Validaton
+name: TF Modules - Validation
 
 on:
   push:
@@ -14,7 +14,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}
   cancel-in-progress: false
 
 permissions:
@@ -46,6 +46,7 @@ jobs:
       ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
       ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
       ARM_USE_OIDC: "true"
+      TERRAFORM_VERSION: "1.6.2"
     strategy:
       fail-fast: false
       matrix:
@@ -61,7 +62,7 @@ jobs:
         uses: hashicorp/setup-terraform@v3
         with:
           terraform_wrapper: false
-          terraform_version: latest
+          terraform_version: ${{ env.TERRAFORM_VERSION }}
 
       - name: Terraform Version
         run: terraform version
@@ -96,7 +97,7 @@ jobs:
               - 'terraform/modules/${{ matrix.modules }}/**'          
 
       - name: Terraform Test
-        if: steps.changes.outputs.module == 'true' || (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'workflow_dispatch')
+        if: steps.changes.outputs.module == 'true' || (github.event_name == 'workflow_dispatch')
         run: |
           OUTPUT=$(terraform test)
           echo "$OUTPUT"

diff --git a/terraform/modules/az-aks/tests/cluster_creation.tftest.hcl b/terraform/modules/az-aks/tests/cluster_creation.tftest.hcl
@@ -18,7 +18,7 @@ run "plan" {
     resource_group_name     = run.setup.resource_group_name
     name                    = "az-aks-cluster"
     configuration           = {
-        version                      = "1.27.3"
+        version                      = "1.28.5"
         sku                          = "Free"
         private_cluster              = true
         user_assigned_identity_id    = run.setup.assigned_identity_id
@@ -99,7 +99,7 @@ run "apply" {
         resource_group_name     = run.setup.resource_group_name
         name                    = "az-aks-cluster"
         configuration           = {
-            version                      = "1.27.3"
+            version                      = "1.28.5"
             sku                          = "Free"
             private_cluster              = true
             user_assigned_identity_id    = run.setup.assigned_identity_id