From bc10b5c164c5146a457f6becec4b4bc81dafbf2d Mon Sep 17 00:00:00 2001 From: Renovator Bot Date: Sat, 6 Jan 2024 04:05:29 +0000 Subject: [PATCH 1/3] chore(deps): update dependency flux-local to v4 --- Containerfile.multiarch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.multiarch b/Containerfile.multiarch index 7f519be..dcbf77a 100644 --- a/Containerfile.multiarch +++ b/Containerfile.multiarch @@ -31,7 +31,7 @@ ENV KUBECONFORM_VERSION="${KUBECONFORM_VERSION:-v0.6.4}" # renovate: datasource=github-releases depName=FairwindsOps/polaris ENV POLARIS_VERSION="${POLARIS_VERSION:-8.5.4}" # renovate: datasource=pypi depName=flux-local -ENV FLUX_LOCAL_VERSION="${FLUX_LOCAL_VERSION:-3.2.0}" +ENV FLUX_LOCAL_VERSION="${FLUX_LOCAL_VERSION:-4.2.2}" ENV PIPX_HOME=/opt/pipx ENV PIPX_BIN_DIR=/usr/local/bin -- 2.24.4 From e835d4d914bd14dd3d934777933dfc0f33dc5772 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 6 Jan 2024 14:34:54 +0100 Subject: [PATCH 2/3] add flux binary as requirement --- Containerfile.multiarch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Containerfile.multiarch b/Containerfile.multiarch index dcbf77a..ce832bd 100644 --- a/Containerfile.multiarch +++ b/Containerfile.multiarch @@ -17,6 +17,8 @@ ARG HELM_VERSION ARG KUSTOMIZE_VERSION ARG KUBECONFORM_VERSION ARG POLARIS_VERSION +ARG FLUX_LOCAL_VERSION +ARG FLUX_VERSION # renovate: datasource=github-releases depName=kubernetes/kubernetes ENV KUBECTL_VERSION="${KUBECTL_VERSION:-v1.29.0}" @@ -32,6 +34,8 @@ ENV KUBECONFORM_VERSION="${KUBECONFORM_VERSION:-v0.6.4}" ENV POLARIS_VERSION="${POLARIS_VERSION:-8.5.4}" # renovate: datasource=pypi depName=flux-local ENV FLUX_LOCAL_VERSION="${FLUX_LOCAL_VERSION:-4.2.2}" +# renovate: datasource=github-releases depName=fluxcd/flux2 +ENV FLUX_VERSION="${FLUX_VERSION:-v2.2.1}" ENV PIPX_HOME=/opt/pipx ENV PIPX_BIN_DIR=/usr/local/bin @@ -52,6 +56,8 @@ RUN apk --update add curl tar bash python3 pipx findutils git && \ | tar xz -C /usr/local/bin kubeconform && \ curl -SsfL "https://github.com/FairwindsOps/polaris/releases/download/${POLARIS_VERSION}/polaris_${TARGETOS}_${TARGETARCH}.tar.gz" \ | tar xz -C /usr/local/bin polaris && \ + curl -SsfL "https://github.com/fluxcd/flux2/releases/download/${FLUX_VERSION}/flux_${FLUX_VERSION##v}_{TARGETOS}_${TARGETARCH}.tar.gz" \ + | tar xz -C /usr/local/bin flux && \ chmod 755 /usr/local/bin/kubectl && \ chmod 755 /usr/local/bin/kubectl-convert && \ chmod 755 /usr/local/bin/yq && \ -- 2.24.4 From f74e329544e9b3b14ea799d0defea7efae0f6fb3 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 6 Jan 2024 14:56:20 +0100 Subject: [PATCH 3/3] fix build --- Containerfile.multiarch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile.multiarch b/Containerfile.multiarch index ce832bd..009b359 100644 --- a/Containerfile.multiarch +++ b/Containerfile.multiarch @@ -56,7 +56,7 @@ RUN apk --update add curl tar bash python3 pipx findutils git && \ | tar xz -C /usr/local/bin kubeconform && \ curl -SsfL "https://github.com/FairwindsOps/polaris/releases/download/${POLARIS_VERSION}/polaris_${TARGETOS}_${TARGETARCH}.tar.gz" \ | tar xz -C /usr/local/bin polaris && \ - curl -SsfL "https://github.com/fluxcd/flux2/releases/download/${FLUX_VERSION}/flux_${FLUX_VERSION##v}_{TARGETOS}_${TARGETARCH}.tar.gz" \ + curl -SsfL "https://github.com/fluxcd/flux2/releases/download/${FLUX_VERSION}/flux_${FLUX_VERSION##v}_${TARGETOS}_${TARGETARCH}.tar.gz" \ | tar xz -C /usr/local/bin flux && \ chmod 755 /usr/local/bin/kubectl && \ chmod 755 /usr/local/bin/kubectl-convert && \ -- 2.24.4