From e5ebbf5071c154695ecf45c98715a681910b9bfe Mon Sep 17 00:00:00 2001 From: Jay Patel <78554593+jarpat@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:12:40 -0500 Subject: [PATCH] feat: (IAC-1193) Update Dependencies to Resolve Security Issues (#92) --- Dockerfile | 6 +++--- README.md | 6 +++--- docs/REQUIREMENTS.md | 6 +++--- requirements.txt | 2 +- roles/kubernetes/common/defaults/main.yaml | 2 +- versions.tf | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 480f93a..ea3b8a8 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.12.0 -ARG KUBECTL_VERSION=1.26.7 -ARG TERRAFORM_VERSION=1.4.5-* +ARG HELM_VERSION=3.13.2 +ARG KUBECTL_VERSION=1.26.10 +ARG TERRAFORM_VERSION=1.6.3-* WORKDIR /build diff --git a/README.md b/README.md index 6a3ce60..521f881 100644 --- a/README.md +++ b/README.md @@ -100,10 +100,10 @@ This project supports the following options for running the scripts in this repo The following software is required in order to run the SAS Viya IaC tools here on your local system: -- [Terraform](https://www.terraform.io/downloads) - v1.4.5 -- [Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) - v2.13.4 +- [Terraform](https://www.terraform.io/downloads) - v1.6.3 +- [Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) - v2.15.6 - [Docker](https://docs.docker.com/engine/install/) - v20.10.17 -- [Helm](https://helm.sh/docs/intro/install/) - v3.12.0 +- [Helm](https://helm.sh/docs/intro/install/) - v3.13.2 #### Docker Requirements diff --git a/docs/REQUIREMENTS.md b/docs/REQUIREMENTS.md index 53387af..e09b5b5 100644 --- a/docs/REQUIREMENTS.md +++ b/docs/REQUIREMENTS.md @@ -681,7 +681,7 @@ The third-party applications that are listed in the following table are supporte | Application | Minimum Version | | ---: | ---: | -| [Ansible](https://www.ansible.com/) | Core 2.13.4 | -| [Terraform](https://www.terraform.io/) | 1.4.5 | +| [Ansible](https://www.ansible.com/) | Core 2.15.6 | +| [Terraform](https://www.terraform.io/) | 1.6.3 | | [Docker](https://www.docker.com/) | 20.10.17 | -| [Helm](https://helm.sh/) | 3.12.0 | +| [Helm](https://helm.sh/) | 3.13.2 | diff --git a/requirements.txt b/requirements.txt index 8f3de7e..3f69aa8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # # Reference : pypi.org # -ansible==8.0.0 # 6.4.0 # 5.5.0 # 2.10.7 +ansible==8.6.0 # 8.0.0 # 6.4.0 # 5.5.0 # 2.10.7 openshift==0.13.1 # 0.12.0 kubernetes==26.1.0 # 24.2.0 # 23.3.0 # 12.0.1 dnspython==2.3.0 # 2.2.1 # 2.1.0 diff --git a/roles/kubernetes/common/defaults/main.yaml b/roles/kubernetes/common/defaults/main.yaml index 40b3b4e..2daaa94 100644 --- a/roles/kubernetes/common/defaults/main.yaml +++ b/roles/kubernetes/common/defaults/main.yaml @@ -2,4 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 --- -helm_version: 3.12.0 +helm_version: 3.13.2 diff --git a/versions.tf b/versions.tf index 67f30f2..b56bbbd 100644 --- a/versions.tf +++ b/versions.tf @@ -6,11 +6,11 @@ terraform { required_providers { vsphere = { source = "hashicorp/vsphere" - version = ">= 2.2.0" + version = "2.5.1" } local = { source = "hashicorp/local" - version = ">= 2.2.3" + version = "2.4.0" } } }