From fe3621952766f5c3ee49cec4f2c988b4ade2b124 Mon Sep 17 00:00:00 2001 From: David Houck Date: Thu, 14 Nov 2024 13:25:49 -0500 Subject: [PATCH] feat: (PSKD-349) OSS Tool Version Updates (#133) Signed-off-by: David.Houck --- CodingStandards.txt | 2 ++ Dockerfile | 8 ++++---- docs/REQUIREMENTS.md | 4 ++-- docs/user/Dependencies.md | 4 ++-- linting-configs/.tflint.hcl | 2 +- versions.tf | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CodingStandards.txt b/CodingStandards.txt index c561669..c6a482c 100644 --- a/CodingStandards.txt +++ b/CodingStandards.txt @@ -50,5 +50,7 @@ For Terraform-related files the standards are: When coding has completed, run the following command: - terraform fmt -recursive + +When committing your changes, use the "git commit -s" form to sign your changes. This is required for the DCO ci/cd step that runs for all PRs. This ensures everyone on the team has the same and consistent file formatting prior to pushing the code into git. diff --git a/Dockerfile b/Dockerfile index d0450b2..794f72e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,9 @@ RUN apt-get update && apt-get upgrade -y --no-install-recommends \ # Layers used for building/downloading/installing tools FROM baseline as tool_builder -ARG HELM_VERSION=3.14.4 -ARG KUBECTL_VERSION=1.29.7 -ARG TERRAFORM_VERSION=1.8.5-* +ARG HELM_VERSION=3.16.2 +ARG KUBECTL_VERSION=1.29.10 +ARG TERRAFORM_VERSION=1.9.8-* WORKDIR /build @@ -18,7 +18,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add - \ && echo "deb [arch=amd64] https://apt.releases.hashicorp.com focal main" > /etc/apt/sources.list.d/tf.list \ && apt-get update \ - && curl -sLO https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl && chmod 755 ./kubectl \ + && curl -sLO https://dl.k8s.io/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl && chmod 755 ./kubectl \ && curl -ksLO https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && chmod 755 get-helm-3 \ && ./get-helm-3 --version v$HELM_VERSION --no-sudo \ && apt-get install -y terraform=$TERRAFORM_VERSION --no-install-recommends \ diff --git a/docs/REQUIREMENTS.md b/docs/REQUIREMENTS.md index e4a8e0c..59908b5 100644 --- a/docs/REQUIREMENTS.md +++ b/docs/REQUIREMENTS.md @@ -684,6 +684,6 @@ The third-party applications that are listed in the following table are supporte | Application | Minimum Version | | ---: | ---: | | [Ansible](https://www.ansible.com/) | Core 2.16.1 | -| [Terraform](https://www.terraform.io/) | 1.8.5 | +| [Terraform](https://www.terraform.io/) | 1.9.8 | | [Docker](https://www.docker.com/) | 20.10.17 | -| [Helm](https://helm.sh/) | 3.14.4 | +| [Helm](https://helm.sh/) | 3.16.2 | diff --git a/docs/user/Dependencies.md b/docs/user/Dependencies.md index 39438de..0d3b9b5 100644 --- a/docs/user/Dependencies.md +++ b/docs/user/Dependencies.md @@ -8,10 +8,10 @@ For dependency installation instructions and sources, links have been provided i |----------------|------------------------------------------------------------------------------------------------------------------------------------------------|-------------| | ~ | [python](https://www.python.org/downloads/) | >=3.10 | | ~ | [pip](https://packaging.python.org/en/latest/guides/installing-using-linux-tools/#installing-pip-setuptools-wheel-with-linux-package-managers) | >=22.0 | -| ~ | [terraform](https://www.terraform.io/downloads) | >=1.4.5 | +| ~ | [terraform](https://www.terraform.io/downloads) | >=1.9.8 | | ~ | [docker](https://docs.docker.com/engine/install/) | >=20.10.17 | | ~ | [helm](https://helm.sh/docs/intro/install/) | >=3 | -| ~ | [kubectl](https://kubernetes.io/docs/tasks/tools/) | 1.26 - 1.28 | +| ~ | [kubectl](https://kubernetes.io/docs/tasks/tools/) | 1.28 - 1.30 | | ~ | [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) | any | | ~ | [jq](https://jqlang.github.io/jq/download/) | >=1.6 | | pip | ansible-core | 2.16.4 | diff --git a/linting-configs/.tflint.hcl b/linting-configs/.tflint.hcl index 337cfd6..02e587e 100644 --- a/linting-configs/.tflint.hcl +++ b/linting-configs/.tflint.hcl @@ -8,7 +8,7 @@ config { # Enables module inspection. - module = true + call_module_type = "all" } plugin "terraform" { diff --git a/versions.tf b/versions.tf index 228a060..a92f7e0 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 terraform { - required_version = ">= 1.4.5" + required_version = ">= 1.9.8" required_providers { vsphere = { source = "hashicorp/vsphere"