From 5414889399955eb749b2aa18a63e9a007e0a2633 Mon Sep 17 00:00:00 2001
From: jkneubuh <86427252+jkneubuh@users.noreply.github.com>
Date: Fri, 8 Apr 2022 12:05:42 -0400
Subject: [PATCH] fixes #708 : ca enrollments should be made with the ROOT CA
 cert (#710)

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
---
 test-network-k8s/scripts/channel.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test-network-k8s/scripts/channel.sh b/test-network-k8s/scripts/channel.sh
index d5d4e7c9..6eb69549 100644
--- a/test-network-k8s/scripts/channel.sh
+++ b/test-network-k8s/scripts/channel.sh
@@ -93,16 +93,16 @@ function enroll_org_admin() {
   CA_URL=https://${CA_AUTH}@${CA_HOST}:${CA_PORT}
 
   # Read the CA's TLS certificate from the cert-manager CA secret
-  echo "retrieving ${org}-ca TLS cert"
+  echo "retrieving ${org}-ca TLS root cert"
   kubectl -n $NS get secret ${org}-ca-tls-cert -o json \
-    | jq -r .data.\"tls.crt\" \
+    | jq -r .data.\"ca.crt\" \
     | base64 -d \
-    > ${CA_DIR}/tls-cert.pem
+    > ${CA_DIR}/tlsca-cert.pem
 
   # enroll the org admin
   FABRIC_CA_CLIENT_HOME=${ORG_ADMIN_DIR} fabric-ca-client enroll \
     --url ${CA_URL} \
-    --tls.certfiles ${CA_DIR}/tls-cert.pem
+    --tls.certfiles ${CA_DIR}/tlsca-cert.pem
 
   # Construct an msp config.yaml
   CA_CERT_NAME=${CA_NAME}-$(echo $DOMAIN | tr -s . -)-${CA_PORT}.pem
@@ -166,7 +166,7 @@ function create_channel_org_MSP() {
 
   # extract the CA's signing authority from the CA/cainfo response
   curl -s \
-    --cacert ${TEMP_DIR}/cas/${ca_name}/tls-cert.pem \
+    --cacert ${TEMP_DIR}/cas/${ca_name}/tlsca-cert.pem \
     https://${ca_name}.${DOMAIN}/cainfo \
     | jq -r .result.CAChain \
     | base64 -d \