From 26fa54411c45c34a6f376aeb1da8c88ea7eab646 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 8 Sep 2021 10:27:56 +0200
Subject: [PATCH] try to use latest local path provisioner chart with our
 changes applied

---
 .../local-path-provisioner-values-configmap.yaml          | 8 ++++++--
 flux2/infrastructure/sources/local-path-provisioner.yaml  | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml b/flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml
index b55298422..fefee71c8 100644
--- a/flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml
+++ b/flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml
@@ -14,8 +14,12 @@ data:
     # We temporarily use our own build in order to use local volumes instead of
     # hostPath.
     image:
-      repository: "open.greenhost.net:4567/openappstack/openappstack/local-path-provisioner"
-      tag: "52f994f-amd64"
+      # 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
+      tag: "use-gitlab-ci"
     resources:
       requests:
         cpu: 200m
diff --git a/flux2/infrastructure/sources/local-path-provisioner.yaml b/flux2/infrastructure/sources/local-path-provisioner.yaml
index 791085cca..1e03b906e 100644
--- a/flux2/infrastructure/sources/local-path-provisioner.yaml
+++ b/flux2/infrastructure/sources/local-path-provisioner.yaml
@@ -7,10 +7,14 @@ spec:
   # The interval at which to check the upstream for updates
   interval: 1h
   # The repository URL, can be a HTTP/S or SSH address
-  url: https://github.com/rancher/local-path-provisioner
+  #
+  # We need to use our own fork of the local-path-provisioner until
+  # https://github.com/rancher/local-path-provisioner/issues/85 is resolved
+  url: https://open.greenhost.net/openappstack/local-path-provisioner
   # The Git reference to checkout and monitor for changes
   # (defaults to master)
   # For all available options, see:
   # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
   ref:
-    tag: v0.0.14
\ No newline at end of file
+    # tag: v0.0.20
+    branch: use-gitlab-ci
-- 
GitLab