From f670bd77779807ac1bb884d73708f32564e2590f Mon Sep 17 00:00:00 2001 From: Basil K Y Date: Tue, 23 Aug 2022 23:37:49 +0530 Subject: [PATCH] rest server working Signed-off-by: Basil K Y --- test-network-k8s/kube/fabric-rest-sample.yaml | 16 +++++++------- test-network-k8s/scripts/ccp-template.json | 6 ++--- test-network-k8s/scripts/rest_sample.sh | 22 +++++++++++-------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/test-network-k8s/kube/fabric-rest-sample.yaml b/test-network-k8s/kube/fabric-rest-sample.yaml index b9a75af4..3007eb0c 100644 --- a/test-network-k8s/kube/fabric-rest-sample.yaml +++ b/test-network-k8s/kube/fabric-rest-sample.yaml @@ -11,7 +11,7 @@ metadata: data: HLF_CONNECTION_PROFILE_ORG1: | { - "name": "${NS}-org1", + "name": "Org1", "version": "1.0.0", "client": { "organization": "Org1", @@ -36,14 +36,14 @@ data: }, "peers": { "org1-peers": { - "url": "grpcs://org1-peer-gateway-svc:7051", + "url": "grpcs://org1-peer1.${ORG1_NS}.svc.cluster.local:7051", "tlsCACerts": { "pem": "-----BEGIN CERTIFICATE-----\\nMIICvzCCAmWgAwIBAgIULJGws7jbEY6ruSgDuvi9L7VphvIwCgYIKoZIzj0EAwIw\\naDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK\\nEwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt\\nY2Etc2VydmVyMB4XDTIxMDkyMDE2MDkwMFoXDTIyMDkyMDE2MTQwMFowYDELMAkG\\nA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl\\ncmxlZGdlcjENMAsGA1UECxMEcGVlcjETMBEGA1UEAxMKb3JnMS1wZWVyMTBZMBMG\\nByqGSM49AgEGCCqGSM49AwEHA0IABL9e3GZBf1MeoObGxwSHkcgDEjMo+/13Qc4u\\nfSG2MKrveHBIEA4MRkHNqd+sTjoz0/1B15y2n+RiPo8uJvlyC/CjgfQwgfEwDgYD\\nVR0PAQH/BAQDAgOoMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV\\nHRMBAf8EAjAAMB0GA1UdDgQWBBSeytspiXlEzMAsnF9/wxqc9fydETAfBgNVHSME\\nGDAWgBQwru1VH0OwH3dxfPdD8w74ZIlLRzAVBgNVHREEDjAMggpvcmcxLXBlZXIx\\nMFsGCCoDBAUGBwgBBE97ImF0dHJzIjp7ImhmLkFmZmlsaWF0aW9uIjoiIiwiaGYu\\nRW5yb2xsbWVudElEIjoib3JnMS1wZWVyMSIsImhmLlR5cGUiOiJwZWVyIn19MAoG\\nCCqGSM49BAMCA0gAMEUCIQDJEjPxceCfXU5B/emrHE4JbEzrZKxLVViBWCNMsHiR\\nFgIgY+8jsvr3rlBPkpRhl8CtT2DgaP7iWvovtMYsPKhLAqk=\\n-----END CERTIFICATE-----\\n" }, "grpcOptions": { "grpc-wait-for-ready-timeout": 100000, - "ssl-target-name-override": "org1-peer-gateway-svc", - "hostnameOverride": "org1-peer-gateway-svc" + "ssl-target-name-override": "org1-peer1.${ORG1_NS}.svc.cluster.local", + "hostnameOverride": "org1-peer1.${ORG1_NS}.svc.cluster.local" } } }, @@ -87,7 +87,7 @@ data: -----END PRIVATE KEY----- HLF_CONNECTION_PROFILE_ORG2: | { - "name": "${NS}-org2", + "name": "Org2", "version": "1.0.0", "client": { "organization": "Org2", @@ -112,13 +112,13 @@ data: }, "peers": { "org2-peers": { - "url": "grpcs://org2-peer-gateway-svc:7051", + "url": "org2-peer1.${ORG2_NS}.svc.cluster.local:7051", "tlsCACerts": { "pem": "-----BEGIN CERTIFICATE-----\\nMIICKDCCAc6gAwIBAgIUJJ4wGOSCfw8XOOIx29o67wBpFB4wCgYIKoZIzj0EAwIw\\naDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK\\nEwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt\\nY2Etc2VydmVyMB4XDTIxMDkyMDExNDEwMFoXDTM2MDkxNjExNDEwMFowaDELMAkG\\nA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl\\ncmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMtY2Etc2Vy\\ndmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEyzGJLZX6pe59QAIBacjfzU4I\\nHezBYLyEu4ySpFx4xwxNLE4BWqLhB1VaOuenSQATM8pmSAy7i1830oM9elKWK6NW\\nMFQwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE\\nFEoAAhmjq/3M8CFPc7N8SL53erL5MA8GA1UdEQQIMAaHBH8AAAEwCgYIKoZIzj0E\\nAwIDSAAwRQIhAJQ5PJOT4Gg8oiBU2KthMPkZqOLeu3Li4S3yBpLFgbsgAiB960P2\\nXPMu3HLoNXrktYOL9JzWlGyYRSPAnkap5Bsj0w==\\n-----END CERTIFICATE-----\\n" }, "grpcOptions": { - "ssl-target-name-override": "org2-peer-gateway-svc", - "hostnameOverride": "org2-peer-gateway-svc" + "ssl-target-name-override": "org2-peer1.${ORG2_NS}.svc.cluster.local", + "hostnameOverride": "org2-peer1.${ORG2_NS}.svc.cluster.local" } } }, diff --git a/test-network-k8s/scripts/ccp-template.json b/test-network-k8s/scripts/ccp-template.json index e3e2b290..b52b773a 100755 --- a/test-network-k8s/scripts/ccp-template.json +++ b/test-network-k8s/scripts/ccp-template.json @@ -24,13 +24,13 @@ }, "peers": { "org${ORG}-peers": { - "url": "grpcs://org${ORG}-peer-gateway-svc:7051", + "url": "grpcs://org${ORG}-peer1.${NS}.svc.cluster.local:7051", "tlsCACerts": { "pem": "${PEERPEM}" }, "grpcOptions": { - "ssl-target-name-override": "org${ORG}-peer-gateway-svc", - "hostnameOverride": "org${ORG}-peer-gateway-svc" + "ssl-target-name-override": "org${ORG}-peer1.${NS}.svc.cluster.local", + "hostnameOverride": "org${ORG}-peer1.${NS}.svc.cluster.local" } } }, diff --git a/test-network-k8s/scripts/rest_sample.sh b/test-network-k8s/scripts/rest_sample.sh index c40c6b78..8da61efd 100755 --- a/test-network-k8s/scripts/rest_sample.sh +++ b/test-network-k8s/scripts/rest_sample.sh @@ -15,13 +15,16 @@ function json_ccp { local ORG=$1 local PP=$(one_line_pem $2) local CP=$(one_line_pem $3) + local NS=$4 sed -e "s/\${ORG}/$ORG/" \ -e "s#\${PEERPEM}#$PP#" \ -e "s#\${CAPEM}#$CP#" \ + -e "s#\${NS}#$NS#" \ scripts/ccp-template.json } function construct_rest_sample_configmap() { + local ns=$ORG1_NS push_fn "Constructing fabric-rest-sample connection profiles" ENROLLMENT_DIR=${TEMP_DIR}/enrollments @@ -32,11 +35,11 @@ function construct_rest_sample_configmap() { local peer_pem=$CHANNEL_MSP_DIR/peerOrganizations/org1/msp/tlscacerts/tlsca-signcert.pem local ca_pem=$CHANNEL_MSP_DIR/peerOrganizations/org1/msp/cacerts/ca-signcert.pem - echo "$(json_ccp 1 $peer_pem $ca_pem)" > build/fabric-rest-sample-config/HLF_CONNECTION_PROFILE_ORG1 + echo "$(json_ccp 1 $peer_pem $ca_pem $ORG1_NS)" > build/fabric-rest-sample-config/HLF_CONNECTION_PROFILE_ORG1 peer_pem=$CHANNEL_MSP_DIR/peerOrganizations/org2/msp/tlscacerts/tlsca-signcert.pem ca_pem=$CHANNEL_MSP_DIR/peerOrganizations/org2/msp/cacerts/ca-signcert.pem - echo "$(json_ccp 2 $peer_pem $ca_pem)" > build/fabric-rest-sample-config/HLF_CONNECTION_PROFILE_ORG2 + echo "$(json_ccp 2 $peer_pem $ca_pem $ORG2_NS)" > build/fabric-rest-sample-config/HLF_CONNECTION_PROFILE_ORG2 cp $ENROLLMENT_DIR/org1/users/org1admin/msp/signcerts/cert.pem $CONFIG_DIR/HLF_CERTIFICATE_ORG1 cp $ENROLLMENT_DIR/org2/users/org2admin/msp/signcerts/cert.pem $CONFIG_DIR/HLF_CERTIFICATE_ORG2 @@ -44,28 +47,29 @@ function construct_rest_sample_configmap() { cp $ENROLLMENT_DIR/org1/users/org1admin/msp/keystore/key.pem $CONFIG_DIR/HLF_PRIVATE_KEY_ORG1 cp $ENROLLMENT_DIR/org2/users/org2admin/msp/keystore/key.pem $CONFIG_DIR/HLF_PRIVATE_KEY_ORG2 - kubectl -n $NS delete configmap fabric-rest-sample-config || true - kubectl -n $NS create configmap fabric-rest-sample-config --from-file=$CONFIG_DIR + kubectl -n $ns delete configmap fabric-rest-sample-config || true + kubectl -n $ns create configmap fabric-rest-sample-config --from-file=$CONFIG_DIR pop_fn } function rollout_rest_sample() { + local ns=$ORG1_NS push_fn "Starting fabric-rest-sample" - kubectl -n $NS apply -f kube/fabric-rest-sample.yaml - kubectl -n $NS rollout status deploy/fabric-rest-sample + kubectl -n $ns apply -f kube/fabric-rest-sample.yaml + kubectl -n $ns rollout status deploy/fabric-rest-sample pop_fn } function launch_rest_sample() { - + local ns=$ORG1_NS construct_rest_sample_configmap - apply_template kube/fabric-rest-sample.yaml + apply_template kube/fabric-rest-sample.yaml $ns - kubectl -n $NS rollout status deploy/fabric-rest-sample + kubectl -n $ns rollout status deploy/fabric-rest-sample log "" log "The fabric-rest-sample has started."