From 28bd31f50c3dfe3e2d2b90c6d84a330cadc0ceef Mon Sep 17 00:00:00 2001 From: Ritika Patil <94649368+riragh@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:22:37 -0600 Subject: [PATCH] feat: (IAC-1221) Update terraform and terraform provider versions (#352) --- Dockerfile | 8 ++++---- README.md | 4 ++-- container-structure-test.yaml | 4 ++-- versions.tf | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 660618ce..1f92e10c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -ARG TERRAFORM_VERSION=1.4.5 -ARG AZURECLI_VERSION=2.53.0 +ARG TERRAFORM_VERSION=1.6.4 +ARG AZURECLI_VERSION=2.54.0 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform FROM mcr.microsoft.com/azure-cli:$AZURECLI_VERSION -ARG KUBECTL_VERSION=1.26.6 +ARG KUBECTL_VERSION=1.26.10 WORKDIR /viya4-iac-azure @@ -12,7 +12,7 @@ COPY . . RUN apk update \ && apk upgrade \ - && apk add --no-cache git openssh \ + && apk add --no-cache git openssh curl\ && curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl \ && chmod 755 ./kubectl /viya4-iac-azure/docker-entrypoint.sh \ && mv ./kubectl /usr/local/bin/kubectl \ diff --git a/README.md b/README.md index e6b4b6a7..ce6592d3 100644 --- a/README.md +++ b/README.md @@ -57,10 +57,10 @@ This project supports two options for running Terraform scripts: Access to an **Azure Subscription** and an [**Identity**](./docs/user/TerraformAzureAuthentication.md) with the *Contributor* role are required. #### Terraform Requirements: -- [Terraform](https://www.terraform.io/downloads.html) - v1.4.5 +- [Terraform](https://www.terraform.io/downloads.html) - v1.6.4 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.26 - [jq](https://stedolan.github.io/jq/) - v1.6 -- [Azure CLI](https://docs.microsoft.com/en-us/cli/azure) - (optional - useful as an alternative to the Azure Portal) - v2.48.1 +- [Azure CLI](https://docs.microsoft.com/en-us/cli/azure) - (optional - useful as an alternative to the Azure Portal) - v2.54.0 #### Docker Requirements: - [Docker](https://docs.docker.com/get-docker/) diff --git a/container-structure-test.yaml b/container-structure-test.yaml index d139c374..56008126 100644 --- a/container-structure-test.yaml +++ b/container-structure-test.yaml @@ -17,7 +17,7 @@ commandTests: - name: "terraform version" command: "terraform" args: ["--version"] - expectedOutput: ["Terraform v1.4.5"] + expectedOutput: ["Terraform v1.6.4"] - name: "python version" command: "python3" args: ["--version"] @@ -29,7 +29,7 @@ commandTests: - -c - | az version -o tsv - expectedOutput: ["2.48.1\t2.48.1\t1.0.8"] + expectedOutput: ["2.54.0\t2.54.0\t1.1.0"] metadataTest: workdir: "/viya4-iac-azure" diff --git a/versions.tf b/versions.tf index 2c514cfe..045f1d38 100644 --- a/versions.tf +++ b/versions.tf @@ -3,20 +3,20 @@ terraform { - required_version = ">= 1.4.5" + required_version = ">= 1.6.4" required_providers { azurerm = { source = "hashicorp/azurerm" - version = "3.64.0" + version = "3.81.0" } azuread = { source = "hashicorp/azuread" - version = "2.39.0" + version = "2.46.0" } external = { source = "hashicorp/external" - version = "2.3.1" + version = "2.3.2" } local = { source = "hashicorp/local" @@ -24,7 +24,7 @@ terraform { } null = { source = "hashicorp/null" - version = "3.2.1" + version = "3.2.2" } tls = { source = "hashicorp/tls" @@ -36,7 +36,7 @@ terraform { } kubernetes = { source = "hashicorp/kubernetes" - version = "2.20.0" + version = "2.23.0" } } }