Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: (PSKD-1403) Dependency Version Bumps #446

Merged
merged 5 commits into from
Mar 7, 2025
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linter-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v3
with:
terraform_version: "^1.9.8"
terraform_version: "^1.10.5"
terraform_wrapper: false

- name: Setup TFLint
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
ARG TERRAFORM_VERSION=1.9.6
ARG AZURECLI_VERSION=2.64.0
ARG TERRAFORM_VERSION=1.10.5
ARG AZURECLI_VERSION=2.70.0

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

WORKDIR /viya4-iac-azure

COPY --from=terraform /bin/terraform /bin/terraform
COPY . .

RUN yum -y install git openssh jq which curl \
&& yum clean all && rm -rf /var/cache/yum \
RUN tdnf -y install git which \
&& tdnf clean all && rm -rf /var/cache/tdnf \
&& curl -sLO https://dl.k8s.io/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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Access to an **Azure Subscription** and an [**Identity**](./docs/user/TerraformA

#### Terraform Requirements:
- [Terraform](https://www.terraform.io/downloads.html) - v1.9.6
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.6
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.30.10
- [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.64.0

Expand Down
4 changes: 2 additions & 2 deletions container-structure-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ commandTests:
- name: "terraform version"
command: "terraform"
args: ["--version"]
expectedOutput: ["Terraform v1.9.6"]
expectedOutput: ["Terraform v1.10.5"]
- name: "python version"
command: "python3"
args: ["--version"]
Expand All @@ -36,7 +36,7 @@ commandTests:
- name: "kubectl version"
command: "kubectl"
args: ["version", "--client"]
expectedOutput: ["Client Version: v1.30.6"]
expectedOutput: ["Client Version: v1.30.10"]

metadataTest:
workdir: "/viya4-iac-azure"
Expand Down
6 changes: 3 additions & 3 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "4.3.0"
version = "4.21.1"
}
azuread = {
source = "hashicorp/azuread"
version = "~>2.53"
version = "~>3.1"
}
external = {
source = "hashicorp/external"
Expand All @@ -36,7 +36,7 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~>2.32"
version = "~>2.36"
}
}
}