Merge branch 'master' into 879-flux-upgrade-leads-to-mutiple-failed-helmreleases

TRIGGER_JOBS=enable-nextcloud,enable-wekan,enable-wordpress,enable-rocketchat

CHANGELOG.md

@@ -5,7 +5,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-* Nothing yet!
+* Update:
+  * Kube-prometheus-stack to helm chart version 18.0.12
 
 ## [0.7.0] - 2021-08-19
 

Dockerfile

+# https://hub.docker.com/_/alpine?tab=tags
 FROM alpine:3.14
 
 LABEL name="OpenAppStack management"
@@ -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.79.0-r0 \
+    chromium=~93.0.4577.82-r0 \
+    curl=~7.79.1-r0 \
     # needed for installing pycurl python module
-    curl-dev=~7.79.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 \

flux2/apps/monitoring/kube-prometheus-stack-release.yaml

@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: kube-prometheus-stack
-      version: 16.12.0
+      version: 18.0.12
       sourceRef:
         kind: HelmRepository
         name: prometheus-community
@@ -17,6 +17,10 @@ spec:
   interval: 1h
   install:
     timeout: 10m
+  upgrade:
+    # Replace (update) CRDs upon upgrade. This is necessary to upgrade from
+    # kube-prometheus-stack 16.x to 18.x
+    crds: CreateReplace
   valuesFrom:
     - kind: ConfigMap
       name: oas-kube-prometheus-stack-values
@@ -28,3 +32,4 @@ spec:
     - kind: Secret
       name: oas-kube-prometheus-stack-override
       optional: true
+

flux2/apps/wekan/wekan-values-configmap.yaml

@@ -6,11 +6,6 @@ metadata:
 data:
   values.yaml: |
     # https://github.com/wekan/wekan/blob/master/helm/wekan/values.yaml
-    image:
-      # https://hub.docker.com/r/wekanteam/wekan
-      repository: quay.io/wekan/wekan
-      # https://quay.io/repository/wekan/wekan?tab=tags
-      tag: v5.41
     # Default env vars in container image: https://github.com/wekan/wekan/blob/master/Dockerfile
     # Env vars explained: https://github.com/wekan/wekan/blob/master/docker-compose.yml
     env:

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/wekan.yaml

@@ -12,4 +12,4 @@ spec:
   # For all available options, see:
   # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
   ref:
-    tag: "v5.42"
+    tag: "v5.60"