epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-22 17:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #708 : ca enrollments should be made with the ROOT CA cert (#710)

Browse source 
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
This commit is contained in:
jkneubuh 2022-04-08 12:05:42 -04:00 committed by GitHub
parent 1617406795
commit 5414889399
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test-network-k8s/scripts/channel.sh
View file

@ -93,16 +93,16 @@ function enroll_org_admin() {
CA_URL=https://${CA_AUTH}@${CA_HOST}:${CA_PORT} CA_URL=https://${CA_AUTH}@${CA_HOST}:${CA_PORT}
# Read the CA's TLS certificate from the cert-manager CA secret # 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 \ kubectl -n $NS get secret ${org}-ca-tls-cert -o json \
| jq -r .data.\"tls.crt\" \ | jq -r .data.\"ca.crt\" \
| base64 -d \ | base64 -d \
> ${CA_DIR}/tls-cert.pem > ${CA_DIR}/tlsca-cert.pem
# enroll the org admin # enroll the org admin
FABRIC_CA_CLIENT_HOME=${ORG_ADMIN_DIR} fabric-ca-client enroll \ FABRIC_CA_CLIENT_HOME=${ORG_ADMIN_DIR} fabric-ca-client enroll \
--url ${CA_URL} \ --url ${CA_URL} \
--tls.certfiles ${CA_DIR}/tls-cert.pem --tls.certfiles ${CA_DIR}/tlsca-cert.pem
# Construct an msp config.yaml # Construct an msp config.yaml
CA_CERT_NAME=${CA_NAME}-$(echo $DOMAIN | tr -s . -)-${CA_PORT}.pem 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 # extract the CA's signing authority from the CA/cainfo response
curl -s \ 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 \ https://${ca_name}.${DOMAIN}/cainfo \
| jq -r .result.CAChain \ | jq -r .result.CAChain \
| base64 -d \ | base64 -d \