From d0cf95333cfe67a96f7487b5f422d025c176c9d5 Mon Sep 17 00:00:00 2001
From: Jesse Hu <huh@vmware.com>
Date: Thu, 10 May 2018 18:37:46 +0800
Subject: [PATCH] [Chart] Fix a ConfigMap mount issue in K8s 1.10

K8s 1.10 throws error when mounting a file into the directory which
is also mounted from a ConfigMap.
Fix issue https://github.com/vmware/harbor/issues/4886
---
 contrib/helm/harbor/templates/notary/notary-cm.yaml     | 2 +-
 contrib/helm/harbor/templates/notary/notary-server.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/helm/harbor/templates/notary/notary-cm.yaml b/contrib/helm/harbor/templates/notary/notary-cm.yaml
index 1b4477992..13c983992 100644
--- a/contrib/helm/harbor/templates/notary/notary-cm.yaml
+++ b/contrib/helm/harbor/templates/notary/notary-cm.yaml
@@ -59,7 +59,7 @@ data:
               "realm": "https://{{ .Values.externalDomain }}/service/token",
               "service": "harbor-notary",
               "issuer": "harbor-token-issuer",
-              "rootcertbundle": "/config/root.crt"
+              "rootcertbundle": "/root.crt"
           }
       }
     }
diff --git a/contrib/helm/harbor/templates/notary/notary-server.yaml b/contrib/helm/harbor/templates/notary/notary-server.yaml
index 12ccf62b3..5deb5b6fd 100644
--- a/contrib/helm/harbor/templates/notary/notary-server.yaml
+++ b/contrib/helm/harbor/templates/notary/notary-server.yaml
@@ -31,7 +31,7 @@ spec:
         - name: notary-config
           mountPath: /config
         - name: root-certificate
-          mountPath: /config/root.crt
+          mountPath: /root.crt
           subPath: root.crt
       volumes:
       - name: notary-config
@@ -40,4 +40,4 @@ spec:
       - name: root-certificate
         secret:
           secretName: "{{ template "harbor.fullname" . }}-registry"
-{{ end }}
\ No newline at end of file
+{{ end }}