Skip to content

Commit

Permalink
feat: (PSKD-349) OSS Tool Version Updates (#133)
Browse files Browse the repository at this point in the history
Signed-off-by: David.Houck <[email protected]>
  • Loading branch information
dhoucgitter authored Nov 14, 2024
1 parent 332fcc9 commit fe36219
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions CodingStandards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ 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

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 \
Expand Down
4 changes: 2 additions & 2 deletions docs/REQUIREMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
4 changes: 2 additions & 2 deletions docs/user/Dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion linting-configs/.tflint.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

config {
# Enables module inspection.
module = true
call_module_type = "all"
}

plugin "terraform" {
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit fe36219

Please sign in to comment.