Skip to content

Commit 62b0266

Browse files
authored
chore: (PSKD-1403) Dependency Version Bumps (#446)
* fix: update versions to address CVEs Signed-off-by: chjmil <christopher.miller@sas.com> * chore: more version bumps Signed-off-by: chjmil <christopher.miller@sas.com> * chore: update docker image based on new azure linux base image Signed-off-by: chjmil <christopher.miller@sas.com> * chore: more version bumps Signed-off-by: chjmil <christopher.miller@sas.com> * docs: update versions Signed-off-by: chjmil <christopher.miller@sas.com> --------- Signed-off-by: chjmil <christopher.miller@sas.com>
1 parent 0ad6a78 commit 62b0266

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

.github/workflows/linter-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Setup Terraform
5050
uses: hashicorp/setup-terraform@v3
5151
with:
52-
terraform_version: "^1.9.8"
52+
terraform_version: "^1.10.5"
5353
terraform_wrapper: false
5454

5555
- name: Setup TFLint

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
ARG TERRAFORM_VERSION=1.9.6
2-
ARG AZURECLI_VERSION=2.64.0
1+
ARG TERRAFORM_VERSION=1.10.5
2+
ARG AZURECLI_VERSION=2.70.0
33

44
FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
55
FROM mcr.microsoft.com/azure-cli:$AZURECLI_VERSION
6-
ARG KUBECTL_VERSION=1.30.6
6+
ARG KUBECTL_VERSION=1.30.10
77

88
WORKDIR /viya4-iac-azure
99

1010
COPY --from=terraform /bin/terraform /bin/terraform
1111
COPY . .
1212

13-
RUN yum -y install git openssh jq which curl \
14-
&& yum clean all && rm -rf /var/cache/yum \
13+
RUN tdnf -y install git which \
14+
&& tdnf clean all && rm -rf /var/cache/tdnf \
1515
&& curl -sLO https://dl.k8s.io/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl \
1616
&& chmod 755 ./kubectl /viya4-iac-azure/docker-entrypoint.sh \
1717
&& mv ./kubectl /usr/local/bin/kubectl \

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ This project supports two options for running Terraform scripts:
5757
Access to an **Azure Subscription** and an [**Identity**](./docs/user/TerraformAzureAuthentication.md) with the *Contributor* role are required.
5858

5959
#### Terraform Requirements:
60-
- [Terraform](https://www.terraform.io/downloads.html) - v1.9.6
61-
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.6
60+
- [Terraform](https://www.terraform.io/downloads.html) - v1.10.5
61+
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.10
6262
- [jq](https://stedolan.github.io/jq/) - v1.6
63-
- [Azure CLI](https://docs.microsoft.com/en-us/cli/azure) - (optional - useful as an alternative to the Azure Portal) - v2.64.0
63+
- [Azure CLI](https://docs.microsoft.com/en-us/cli/azure) - (optional - useful as an alternative to the Azure Portal) - v2.70.0
6464

6565
#### Docker Requirements:
6666
- [Docker](https://docs.docker.com/get-docker/)

container-structure-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ commandTests:
2121
- name: "terraform version"
2222
command: "terraform"
2323
args: ["--version"]
24-
expectedOutput: ["Terraform v1.9.6"]
24+
expectedOutput: ["Terraform v1.10.5"]
2525
- name: "python version"
2626
command: "python3"
2727
args: ["--version"]
@@ -32,11 +32,11 @@ commandTests:
3232
- -c
3333
- |
3434
az version -o tsv
35-
expectedOutput: ["2.64.0\t2.64.0\t1.1.0"]
35+
expectedOutput: ["2.70.0\t2.70.0\t1.1.0"]
3636
- name: "kubectl version"
3737
command: "kubectl"
3838
args: ["version", "--client"]
39-
expectedOutput: ["Client Version: v1.30.6"]
39+
expectedOutput: ["Client Version: v1.30.10"]
4040

4141
metadataTest:
4242
workdir: "/viya4-iac-azure"

versions.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
terraform {
55

6-
required_version = ">= 1.9.6"
6+
required_version = ">= 1.10.0"
77

88
required_providers {
99
azurerm = {
1010
source = "hashicorp/azurerm"
11-
version = "4.3.0"
11+
version = "4.21.1"
1212
}
1313
azuread = {
1414
source = "hashicorp/azuread"
15-
version = "~>2.53"
15+
version = "~>3.1"
1616
}
1717
external = {
1818
source = "hashicorp/external"
@@ -36,7 +36,7 @@ terraform {
3636
}
3737
kubernetes = {
3838
source = "hashicorp/kubernetes"
39-
version = "~>2.32"
39+
version = "~>2.36"
4040
}
4141
}
4242
}

0 commit comments

Comments
 (0)