From 651dfde8ca157d41460ac2de8e60033de2dd3d8e Mon Sep 17 00:00:00 2001
From: Rob Kooper <kooper@illinois.edu>
Date: Tue, 28 Sep 2021 20:44:42 -0500
Subject: [PATCH] use special image for nfs
---
charts/apps/templates/storage/nfs.yaml | 4 ++++
terraform/modules/argocd/templates/argocd.yaml.tmpl | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/charts/apps/templates/storage/nfs.yaml b/charts/apps/templates/storage/nfs.yaml
index 288d0e6..0918f36 100644
--- a/charts/apps/templates/storage/nfs.yaml
+++ b/charts/apps/templates/storage/nfs.yaml
@@ -31,6 +31,10 @@ spec:
version: v3
releaseName: nfs-condo
values: |
+ image:
+ repository: kooper/nfs-subdir-external-provisioner
+ tag: v4.0.3
+
storageClass:
name: nfs-condo
archiveOnDelete: false
diff --git a/terraform/modules/argocd/templates/argocd.yaml.tmpl b/terraform/modules/argocd/templates/argocd.yaml.tmpl
index d1461f2..a241a83 100644
--- a/terraform/modules/argocd/templates/argocd.yaml.tmpl
+++ b/terraform/modules/argocd/templates/argocd.yaml.tmpl
@@ -89,7 +89,7 @@ spec:
enabled: ${nfs_enabled}
server: ${nfs_server}
path: ${nfs_path}
- pathPattern: "${cluster_name}/$${.PVC.namespace}-$${.PVC.name}-$${.PV.name}"
+ pathPattern: "${cluster_name}/$${.PVC.namespace}-$${.PVC.name}-$${.PVC.volume}"
cinder:
enabled: ${cinder_enabled}
--
GitLab