[HLF-CA] Fix intermediate CAs (#8761)

Signed-off-by: Alejandro Vicente Grabovetsky <sasha@aid.technology>
helm · Oct 26, 2018 · dec56b7 · dec56b7
1 parent 1d5fbd8
commit dec56b7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/stable/hlf-ca/Chart.yaml b/stable/hlf-ca/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Hyperledger Fabric Certificate Authority chart (these charts are created by AID:Tech and are currently not directly associated with the Hyperledger project)
 name: hlf-ca
-version: 1.1.2
+version: 1.1.3
 appVersion: 1.2.0
 keywords:
   - blockchain

diff --git a/stable/hlf-ca/README.md b/stable/hlf-ca/README.md
@@ -18,7 +18,6 @@ This CA can then be used to register and enroll identities for clients, admins a
 
 - Kubernetes 1.9+
 - PV provisioner support in the underlying infrastructure.
-- A running [PostgreSQL Chart](https://github.com/kubernetes/charts/tree/master/stable/postgresql) to host the Hyperledger Fabric CA data, in a database defined under the settings `db.database`.
 
 ## Installing the Chart
 

diff --git a/stable/hlf-ca/templates/deployment.yaml b/stable/hlf-ca/templates/deployment.yaml
@@ -122,12 +122,12 @@ spec:
             - name: PARENT_CA_ADMIN
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.config.intermediate.parent.chart | quote }}
+                  name: {{ .Values.config.intermediate.parent.chart }}--ca
                   key: CA_ADMIN
             - name: PARENT_CA_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.config.intermediate.parent.chart | quote }}
+                  name: {{ .Values.config.intermediate.parent.chart }}--ca
                   key: CA_PASSWORD
             {{- end}}
           ports:

diff --git a/stable/hlf-ca/values.yaml b/stable/hlf-ca/values.yaml
@@ -97,7 +97,7 @@ mysql:
       sql-mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 
 ##
-## External Database configuration (MySQL or PostgresSQL install outside Kubernetes)
+## External Database configuration (MySQL or PostgresSQL installed on/off Kubernetes)
 ##
 externalDatabase:
   # Either postgres or mysql