diff --git a/ansible/roles/helm/defaults/main.yml b/ansible/roles/helm/defaults/main.yml index b367a66d..74bcb7df 100644 --- a/ansible/roles/helm/defaults/main.yml +++ b/ansible/roles/helm/defaults/main.yml @@ -1,6 +1,6 @@ --- -helm_version: v3.15.3 +helm_version: v3.15.4 helm_diff_version: 3.9.9 helm_url: https://get.helm.sh/helm-{{ helm_version }}-linux-amd64.tar.gz install_dir: /usr/local/bin diff --git a/ansible/roles/jenkins_master/templates/12-custom-tools.groovy.j2 b/ansible/roles/jenkins_master/templates/12-custom-tools.groovy.j2 index 1ed5f370..f3d13303 100644 --- a/ansible/roles/jenkins_master/templates/12-custom-tools.groovy.j2 +++ b/ansible/roles/jenkins_master/templates/12-custom-tools.groovy.j2 @@ -20,8 +20,8 @@ def RemoveTool(desc, name) { } def Tools = [] -Tools.add(name: 'Terraform', url: 'https://releases.hashicorp.com/terraform/1.9.2/terraform_1.9.2_linux_amd64.zip') -Tools.add(name: 'Packer', url: 'https://releases.hashicorp.com/packer/1.11.0/packer_1.11.0_linux_amd64.zip') +Tools.add(name: 'Terraform', url: 'https://releases.hashicorp.com/terraform/1.9.4/terraform_1.9.4_linux_amd64.zip') +Tools.add(name: 'Packer', url: 'https://releases.hashicorp.com/packer/1.11.2/packer_1.11.2_linux_amd64.zip') def inst = Jenkins.getInstance() def desc = inst.getExtensionList(com.cloudbees.jenkins.plugins.customtools.CustomTool.DescriptorImpl.class)[0] diff --git a/pipelines/dockerfiles/tool-box/Dockerfile b/pipelines/dockerfiles/tool-box/Dockerfile index 1df1ecd6..412d76f6 100644 --- a/pipelines/dockerfiles/tool-box/Dockerfile +++ b/pipelines/dockerfiles/tool-box/Dockerfile @@ -10,10 +10,10 @@ RUN apk --no-cache add curl unzip ARG INSTALL_DIR="/usr/local/bin" -ARG TERRAFORM_VERSION=1.9.2 +ARG TERRAFORM_VERSION=1.9.4 ARG TERRAFORM_URL=https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip ARG TERRAFORM_FILE=terraform_${TERRAFORM_VERSION}_linux_amd64.zip -ARG TERRAFORM_SHA256=d5f5aaba0f8ebff88ef0b23935872e154e2abf3172596261be834605ba3ba714 +ARG TERRAFORM_SHA256=6e9b2cc741875ab906d800af3134b076489f049565e0a1dbdb6deacd91f5054c RUN set -exo pipefail; curl -fsSL --retry 3 -o ${TERRAFORM_FILE} ${TERRAFORM_URL}; \ sha256sum ${TERRAFORM_FILE} | grep ${TERRAFORM_SHA256}; \ @@ -30,10 +30,10 @@ RUN set -exo pipefail; curl -fsSL --retry 3 -o ${KUBECTL_FILE} ${KUBECTL_URL}; \ mv ${KUBECTL_FILE} ${INSTALL_DIR}/${KUBECTL_FILE}; \ chmod +x ${INSTALL_DIR}/${KUBECTL_FILE} -ARG HELM_VERSION=v3.15.3 +ARG HELM_VERSION=v3.15.4 ARG HELM_URL=https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz ARG HELM_FILE=helm-${HELM_VERSION}-linux-amd64.tar.gz -ARG HELM_SHA256=ad871aecb0c9fd96aa6702f6b79e87556c8998c2e714a4959bf71ee31282ac9c +ARG HELM_SHA256=11400fecfc07fd6f034863e4e0c4c4445594673fd2a129e701fe41f31170cfa9 RUN set -exo pipefail; curl -fsSL --retry 3 -o ${HELM_FILE} ${HELM_URL}; \ sha256sum ${HELM_FILE} | grep ${HELM_SHA256}; \