Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Update vault, packer, sops versions and add vault to mitogen image #654

Merged
merged 4 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 2 additions & 14 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ kubetools-helm:
# https://github.com/variantdev/vals/releases
VALS_VERSION: "0.33.0"
# https://releases.hashicorp.com/vault/
VAULT_VERSION: "1.15.4"
VAULT_VERSION: "1.17.3"
# https://github.com/kubernetes-sigs/kustomize/releases
KUSTOMIZE_VERSION: "4.5.7"
script:
Expand Down Expand Up @@ -831,7 +831,7 @@ python:
<<: *default-vars
PYTHON_VERSION: "3.12"
# https://releases.hashicorp.com/vault/
VAULT_VERSION: "1.15.4"
VAULT_VERSION: "1.17.3"
script:
- |
cat <<-EOT
Expand Down Expand Up @@ -862,10 +862,6 @@ terraform:
<<: *docker_build
variables:
<<: *default-vars
# https://releases.hashicorp.com/terraform/
TERRAFORM_VERSION: "1.5.6"
# https://releases.hashicorp.com/vault/
VAULT_VERSION: "1.15.4"
script:
- |
cat <<-EOT
Expand Down Expand Up @@ -898,10 +894,6 @@ sops:
<<: *docker_build
variables:
<<: *default-vars
# https://github.com/mozilla/sops/releases/
SOPS_VERSION: "3.7.3"
# https://releases.hashicorp.com/vault/
VAULT_VERSION: "1.11.2"
script:
- |
cat <<-EOT
Expand Down Expand Up @@ -934,10 +926,6 @@ packer:
<<: *docker_build
variables:
<<: *default-vars
# https://releases.hashicorp.com/packer/
PACKER_VERSION: "1.8.7"
# https://releases.hashicorp.com/vault/
VAULT_VERSION: "1.13.2"
script:
- export IMAGE_DATE_TAG="$CI_COMMIT_SHORT_SHA-$(date +%Y%m%d)"
- |
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/kube-manifests-validation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG HELM_VERSION=3.12.2
ARG GATOR_VERSION=3.12.0
ARG DATREE_VERSION=1.9.19
ARG YQ_VERSION=4.34.2
ARG VAULT_VERSION=1.14.1
ARG VAULT_VERSION=1.17.3
ARG K8S_SCHEMA_VERSION=1.25.9
ARG K8S_SCHEMA_REPO_COMMIT_SHA=a43aa7eceaf4c32c5f45c9fc477588e7a12f18b6
ARG CRDS_SCHEMA_REPO_COMMIT_SHA=8f0604e873746d6b2d49794e5b37768460e7b545
Expand Down
11 changes: 9 additions & 2 deletions dockerfiles/mitogen/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ FROM docker.io/library/python:3.9-slim-buster
ARG VCS_REF=master
ARG BUILD_DATE=""
ARG REGISTRY_PATH=docker.io/paritytech
ARG VAULT_VERSION=1.17.3

LABEL io.parity.image.authors="[email protected]" \
io.parity.image.vendor="Parity Technologies" \
Expand All @@ -18,9 +19,15 @@ dockerfiles/mitogen/README.md" \

RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
sshpass ssh-client rsync tini curl git ruby \
sshpass ssh-client rsync tini curl git ruby unzip \
&& rm -rf /var/lib/apt/lists/*

RUN curl "https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip" \
-o vault.zip; \
unzip vault.zip -d /usr/local/bin/vault; \
rm vault.zip; \
chmod +x /usr/local/bin/vault

RUN pip install --no-cache-dir pip --upgrade
RUN pip install --no-cache-dir ansible==5.10 google-auth requests jmespath dnspython

Expand All @@ -29,7 +36,7 @@ RUN curl -fSL -o /usr/local/bin/subkey 'https://releases.parity.io/substrate/x8

ENV ANSIBLE_STRATEGY=mitogen_linear
ENV ANSIBLE_STRATEGY_PLUGINS=/opt/mitogen/ansible_mitogen/plugins/strategy
RUN cd /opt && git clone --depth 1 --branch v0.3.3 https://github.com/mitogen-hq/mitogen.git
RUN cd /opt && git clone --depth 1 --branch v0.3.9 https://github.com/mitogen-hq/mitogen.git

ARG WORKDIR=/work
RUN groupadd --gid 10001 nonroot && \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/packer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ FROM docker.io/paritytech/mitogen:latest
ARG VCS_REF=master
ARG BUILD_DATE=""
ARG REGISTRY_PATH=docker.io/paritytech
ARG PACKER_VERSION
ARG VAULT_VERSION
ARG PACKER_VERSION=1.8.7
ARG VAULT_VERSION=1.17.3

LABEL io.parity.image.authors="[email protected]" \
io.parity.image.vendor="Parity Technologies" \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/sops/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM docker.io/library/alpine:latest
ARG VCS_REF=master
ARG BUILD_DATE=""
ARG REGISTRY_PATH=docker.io/paritytech
ARG SOPS_VERSION
ARG VAULT_VERSION
ARG SOPS_VERSION=3.9.0
ARG VAULT_VERSION=1.17.3

# metadata
LABEL io.parity.image.authors="[email protected]" \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/terraform/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ FROM docker.io/library/alpine:latest
ARG VCS_REF=master
ARG BUILD_DATE=""
ARG REGISTRY_PATH=docker.io/paritytech
ARG TERRAFORM_VERSION
ARG VAULT_VERSION
ARG TERRAFORM_VERSION=1.5.6
ARG VAULT_VERSION=1.17.3

# metadata
LABEL io.parity.image.authors="[email protected]" \
Expand Down