Skip to content
Snippets Groups Projects
Commit 913376b9 authored by Arie Peterson's avatar Arie Peterson
Browse files

Merge branch '1075-update-flux-to-version-which-include-helm-3-7-again' into 'main'

Resolve "Update flux to version which include helm 3.7 again"

Closes #1075

See merge request stackspin/stackspin!783
parents dbb1a037 a6854a89
Branches
Tags
No related merge requests found
......@@ -9,11 +9,11 @@ ENV TAIKO_SKIP_CHROMIUM_DOWNLOAD=true
ENV TAIKO_BROWSER_PATH=/usr/bin/chromium-browser
ENV TAIKO_BROWSER_ARGS=--no-sandbox,--start-maximized,--disable-dev-shm-usage,--ignore-certificate-errors
ADD https://github.com/fluxcd/flux2/releases/download/v0.22.0/flux_0.22.0_linux_amd64.tar.gz /tmp/
ADD https://github.com/fluxcd/flux2/releases/download/v0.25.3/flux_0.25.3_linux_amd64.tar.gz /tmp/
COPY ./requirements.txt /requirements.txt
RUN \
# Install kubectl from alpine edge until alpine 3.16 is released
apk --no-cache add kubectl=~1.23.1-r0 \
apk --no-cache add kubectl=~1.23.3-r0 \
--repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing && \
apk --no-cache add \
bash=~5.1.8-r0 \
......
......@@ -9,7 +9,7 @@ ansible_python_interpreter: "/usr/bin/env python3"
# Application versions
flux:
# https://github.com/fluxcd/flux2/releases
version: 0.22.0
version: 0.25.3
k3s:
# https://github.com/k3s-io/k3s/releases
......
......@@ -22,7 +22,7 @@ Prerequisites
-------------
- ``kubectl`` (`installation instructions <https://kubernetes.io/docs/tasks/tools/#kubectl>`__)
- ``flux version 0.22.0`` (`Download flux_0.22.0_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.22.0/flux_0.22.0_linux_amd64.tar.gz>`_)
- ``flux version 0.25.3`` (`Download flux_0.25.3_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.25.3/flux_0.25.3_linux_amd64.tar.gz>`_)
Configuration
-------------
......
#!/usr/bin/env bash
if [ "$(flux --version)" != "flux version 0.22.0" ]; then
echo "The Stackspin installation only works with Flux version 0.22.0"
if [ "$(flux --version)" != "flux version 0.25.3" ]; then
echo "The Stackspin installation only works with Flux version 0.25.3"
exit 1
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment