Merge branch 'master' into 880-document-yamltojson-error

Dockerfile

+# https://hub.docker.com/_/alpine?tab=tags
 FROM alpine:3.14
 
 LABEL name="OpenAppStack management"
@@ -8,7 +9,7 @@ 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.14.2/flux_0.14.2_linux_amd64.tar.gz /tmp/
+ADD https://github.com/fluxcd/flux2/releases/download/v0.17.2/flux_0.17.2_linux_amd64.tar.gz /tmp/
 # Download kubectl until it's packaged in alpine > 3.14
 ADD https://dl.k8s.io/release/v1.21.0/bin/linux/amd64/kubectl /usr/local/bin/
 COPY ./test/pytest/le-staging-bundle.pem /usr/local/share/ca-certificates/le-staging-bundle.pem
@@ -17,10 +18,10 @@ RUN \
   apk --no-cache add \
     bash=~5.1.4-r0 \
     cargo=~1.52.1-r1 \
-    chromium=~91.0.4472.164-r0 \
-    curl=~7.78.0-r0 \
+    chromium=~93.0.4577.82-r0 \
+    curl=~7.79.1-r0 \
     # needed for installing pycurl python module
-    curl-dev=~7.78.0-r0 \
+    curl-dev=~7.79.1-r0 \
     # Needed for "unbuffer" to timestamp cmds
     expect=~5.45.4-r0 \
     gcc=~10.3.1_git20210424-r2 \
@@ -35,7 +36,7 @@ RUN \
     py3-pip=~20.3.4-r1 \
     python3-dev=~3.9.5-r1 \
     rsync=~3.2.3-r4 \
-    yq=4.6.3-r1 && \
+    yq=4.6.3-r2 && \
   rm -rf /var/cache/* && \
   mkdir /var/cache/apk && \
   chmod a+x /usr/local/bin/* && \

README.md

@@ -10,4 +10,3 @@ a single-node kubernetes cluster.
 Please refer to https://docs.openappstack.net for further details,
 and to [the installation tutorial](docs/installation_instructions.md) for a step
 by step installation tutorial how to install your cluster.
-

ansible/group_vars/all/oas.yml

@@ -8,9 +8,11 @@ ansible_python_interpreter: "/usr/bin/env python3"
 
 # Application versions
 flux:
-  version: 0.14.2
+  # https://github.com/fluxcd/flux2/releases
+  version: 0.17.2
 
 k3s:
+  # https://github.com/k3s-io/k3s/releases
   version: 'v1.21.2+k3s1'
   # args to start the k3s server with
   # https://rancher.com/docs/k3s/latest/en/installation/install-options/server-config/
@@ -23,6 +25,7 @@ helm:
   # (https://open.greenhost.net/openappstack/openappstack/issues/338), so we
   # use a pinned version for now.
   # We use the official helm install script for now which has no checksum.
+  # https://github.com/helm/helm/releases
   version: 'v3.2.1'
 
 krew:

docs/installation/install_oas.rst

@@ -53,7 +53,7 @@ Prerequisites
 -------------
 
 - ``kubectl`` (`installation instructions <https://kubernetes.io/docs/tasks/tools/#kubectl>`__)
-- ``flux version 0.14.2`` `Download flux_0.14.2_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.14.2/flux_0.14.2_linux_amd64.tar.gz>`_
+- ``flux version 0.17.2`` `Download flux_0.17.2_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.17.2/flux_0.17.2_linux_amd64.tar.gz>`_
 
 Copy the file ``install/.flux.env.example`` to your cluster dir
 ``clusters/oas.example.org/.flux.env``. This file contains the last bit of

flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml

@@ -12,10 +12,9 @@ data:
     storageClass:
       defaultClass: true
     # We temporarily use our own build in order to use local volumes instead of
-    # hostPath.
+    # hostPath, see https://github.com/rancher/local-path-provisioner/issues/85
+    # and https://open.greenhost.net/openappstack/openappstack/-/issues/773
     image:
-      # We need to use our own fork of the local-path-provisioner until
-      # https://github.com/rancher/local-path-provisioner/issues/85 is resolved
       repository: "open.greenhost.net:4567/openappstack/local-path-provisioner/local-path-provisioner"
       # Make sure this tag is the same as the tag for the chart in the
       # local-path-provisioner GitRepository

flux2/infrastructure/sources/wordpress.yaml

@@ -13,4 +13,4 @@ spec:
   # For all available options, see:
   # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
   ref:
-    tag: 0.2.0
+    tag: 0.2.2

install/flux-version-check.sh

-# See https://open.greenhost.net/openappstack/openappstack/-/issues/879 for
-# context why OAS doesn't work with newer flux versions.
-if [ "$(flux --version)" != "flux version 0.14.2" ]; then
-    echo "The OpenAppStack installation only works with Flux version 0.14.2"
+if [ "$(flux --version)" != "flux version 0.17.2" ]; then
+    echo "The OpenAppStack installation only works with Flux version 0.17.2"
     exit 1;
 fi