Updated Terraform version in cicd executor, pinned aks module version…

… and added terraform lock in gitignore * Updated Terraform version in cicd executor, pinned aks module version, added terraform lock file in gitignore * Updated deprecated keys in circleci config file * Removed entry from gitignore * Reinstated entry in gitignore * Removed Terraform lock file
GeekZoneHQ · May 6, 2024 · 2c85f4b · 2c85f4b
1 parent 1b8116e
commit 2c85f4b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 88 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.7
+          version: default
       - run:
           name: Create .terraformrc file locally
           command: >-
@@ -15,8 +15,8 @@ jobs:
       - run:
           name: Install Terraform cli
           command: |
-            wget https://releases.hashicorp.com/terraform/1.4.2/terraform_1.4.2_linux_386.zip
-            unzip terraform_1.4.2_linux_386.zip
+            wget https://releases.hashicorp.com/terraform/1.8.2/terraform_1.8.2_linux_386.zip
+            unzip terraform_1.8.2_linux_386.zip
             sudo mv terraform /usr/local/bin
       - run:
           name: Terraform cycle
@@ -37,12 +37,12 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 20.10.7
+          version: default
       - run:
           name: Build geekzone/infra image
           command: |
             docker build -t geekzone/infra:$TAG .
-      - deploy:
+      - run:
           name: Push geekzone/infra image to Docker Hub
           command: |
             docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 # Local .terraform directories
 **/.terraform/*
 
+# Providers version file
+**/.terraform.lock.hcl
+
 # .tfstate files
 terraform/*.tfstate
 terraform/*.tfstate.*

diff --git a/azure/terraform-azure/.terraform.lock.hcl b/azure/terraform-azure/.terraform.lock.hcl
diff --git a/azure/terraform-azure/main.tf b/azure/terraform-azure/main.tf
@@ -106,6 +106,7 @@ resource "azurerm_subnet" "endpoint" {
 
 module "aks" {
   source                            = "Azure/aks/azurerm"
+  version                           = "7.4.0"
   resource_group_name               = azurerm_resource_group.geekzone.name
   client_id                         = var.ARM_CLIENT_ID
   client_secret                     = var.ARM_CLIENT_SECRET
@@ -120,7 +121,7 @@ module "aks" {
   role_based_access_control_enabled = false
   rbac_aad                          = false
   rbac_aad_managed                  = false
-  private_cluster_enabled           = false # default value
+  private_cluster_enabled           = false
   http_application_routing_enabled  = false
   azure_policy_enabled              = true
   public_network_access_enabled     = false