Fix issues with package name

Signed-off-by: munapower <mmunaro@hotmail.com>

Author: munapower

samples/deployment/k8s/README.md

@@ -99,9 +99,9 @@ make these images available inside the k8s environment.
 With minikube we can easily do that by calling the following commands:
 
 ```bash
-minikube cache add fpc/ercc:latest
-minikube cache add fpc/fpccc:latest
-minikube cache add fpc/fpcclient:latest
+minikube image load fpc/ercc:latest
+minikube image load fpc/fpccc:latest
+minikube image load fpc/fpcclient:latest
 ```
 
 You can double check if the images are available. Please also carefully check if the image ID corresponds to the image you want to use.
@@ -229,8 +229,8 @@ kubectl exec -it cli_orgX_pod_name bash -n hyperledger
 # for all peers of orgX we install ercc and fpccc
 export ERCC=ercc-peer0-$ORG; export FPCCC=fpccc-peer0-$ORG
 
-peer lifecycle chaincode install packages/$ERCC.tgz
-peer lifecycle chaincode install packages/$FPCCC.tgz
+peer lifecycle chaincode install packages/$ERCC.tar.gz
+peer lifecycle chaincode install packages/$FPCCC.tar.gz
 peer lifecycle chaincode queryinstalled
 
 export ERCC_PKG_ID=$(peer lifecycle chaincode queryinstalled | grep ercc | awk '{print $3}' | sed 's/.$//')

samples/deployment/k8s/generate.sh

@@ -70,7 +70,7 @@ done
 echo "Package ercc and fpccc"
 function packageChaincode() {
 
-  address="${peer}_${CC_NAME}_ccaas:${CHAINCODE_SERVER_PORT}"
+  address="{{.peername}}_${CC_NAME}_ccaas:${CHAINCODE_SERVER_PORT}"
   prefix=$(basename "$0")
   tempdir=$(mktemp -d -t "$prefix.XXXXXXXX") || error_exit "Error creating temporary directory"
   label=${CC_NAME}_${CC_VERSION}
@@ -94,14 +94,14 @@ cat << METADATA-EOF > "$tempdir/pkg/metadata.json"
 METADATA-EOF
 
     tar -C "$tempdir/src" -czf "$tempdir/pkg/code.tar.gz" .
-    tar -C "$tempdir/pkg" -czf "$CC_NAME.tar.gz" metadata.json code.tar.gz
+    tar -C "$tempdir/pkg" -czf "$CC_NAME-$peer.tar.gz" metadata.json code.tar.gz
     rm -Rf "$tempdir"
 
 #    PACKAGE_ID=$(peer lifecycle chaincode calculatepackageid ${CC_NAME}.tar.gz)
 # commenting due to the network not yet being setup to calculate package_id 
 
-    mv $CC_NAME.tar.gz $packageDir
-    successln "Chaincode is packaged  ${address} and in ${packageDir}/${CC_NAME}.tar.gz"
+    mv $CC_NAME-$1.tar.gz $packageDir
+    successln "Chaincode is packaged  ${address} and in ${packageDir}/${CC_NAME}-${1}.tar.gz"
 
 }
 
@@ -121,15 +121,15 @@ mkdir $packageDir
 for peer in $(shopt -s globstar; find ${cryptoConfigDir}/**/peers/ -mindepth 1 -maxdepth 1 -execdir echo {} ';' | sed 's/^\.\///g');
 do
     # ercc
-    CC_NAME="${ERCC_ID}-${peer}"
+    CC_NAME="${ERCC_ID}"
     CC_VERSION=$ERCC_VER
 #    endpoint="${ERCC_ID}-${peer}:${CHAINCODE_SERVER_PORT}"
 #    packageName="${ERCC_ID}-${peer}.tgz"
 #    packageChaincode "${packageDir}" "${packageName}" "${ERCC_ID}" "${ERCC_VER}" "${CC_TYPE}" "${endpoint}" "${peer}"
     packageChaincode "${peer}"
 
     # fpc cc
-    CC_NAME="${FPCCC_ID}-${peer}"
+    CC_NAME="${FPCCC_ID}"
 #    endpoint="${FPCCC_ID}-${peer}:${CHAINCODE_SERVER_PORT}"
 #    packageName="${FPCCC_ID}-${peer}.tgz"
 #    packageChaincode "${packageDir}" "${packageName}" "${FPCCC_ID}" "${FPC_MRENCLAVE}" "${CC_TYPE}" "${endpoint}" "${peer}"

samples/deployment/k8s/scripts/installCC.sh

@@ -9,8 +9,8 @@ set -euo pipefail
 ERCC=ercc-peer0-$ORG
 FPCCC=fpccc-peer0-$ORG
 
-peer lifecycle chaincode install packages/$ERCC.tgz
-peer lifecycle chaincode install packages/$FPCCC.tgz
+peer lifecycle chaincode install packages/$ERCC.tar.gz
+peer lifecycle chaincode install packages/$FPCCC.tar.gz
 peer lifecycle chaincode queryinstalled
 
 ERCC_PKG_ID=$(peer lifecycle chaincode queryinstalled | grep ercc | awk '{print $3}' | sed 's/.$//')