Skip to content

Commit

Permalink
feat: (IAC-1221) Update terraform and terraform provider versions (#352)
Browse files Browse the repository at this point in the history
  • Loading branch information
riragh authored Nov 29, 2023
1 parent 8ba8181 commit 28bd31f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
4 changes: 2 additions & 2 deletions container-structure-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@

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"
version = "2.4.0"
}
null = {
source = "hashicorp/null"
version = "3.2.1"
version = "3.2.2"
}
tls = {
source = "hashicorp/tls"
Expand All @@ -36,7 +36,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "2.20.0"
version = "2.23.0"
}
}
}

0 comments on commit 28bd31f

Please sign in to comment.