Feature/fabric builder k8s (#739)

* Support the fabric-builder-k8s for the chaincode "easy button." Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com> * Run the CI/CD test suite using the correct matrix env for k8s builder Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com> * Incorporate review feedback : remove zz_unused and pkgk8scc routines Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
hyperledger · May 26, 2022 · 525ff9f · 525ff9f
1 parent 636a273
commit 525ff9f
Show file tree

Hide file tree

Showing 15 changed files with 260 additions and 50 deletions.
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -121,6 +121,7 @@ jobs:
         Basic-Typescript:
           CHAINCODE_NAME: basic
           CHAINCODE_LANGUAGE: typescript
+
     steps:
       - template: templates/install-deps.yml
       - script: sudo apt-get install softhsm2
@@ -135,12 +136,17 @@ jobs:
       vmImage: ubuntu-20.04
     strategy:
       matrix:
-        Typescript-Java:
+        CCaaS-Java:
           CLIENT_LANGUAGE: typescript
           CHAINCODE_LANGUAGE: java
-        Typescript-Golang:
+        CCaaS-Golang:
           CLIENT_LANGUAGE: typescript
           CHAINCODE_LANGUAGE: external
+        K8s-Builder-Java:
+          CHAINCODE_NAME: basic
+          CHAINCODE_LANGUAGE: java
+          CHAINCODE_BUILDER: k8s
+
     steps:
       - template: templates/install-k8s-deps.yml
       - script: ../ci/scripts/run-k8s-test-network-basic.sh

diff --git a/ci/scripts/run-k8s-test-network-basic.sh b/ci/scripts/run-k8s-test-network-basic.sh
@@ -10,6 +10,7 @@ set -euo pipefail
 export CONTAINER_CLI=${CONTAINER_CLI:-docker}
 export CLIENT_LANGUAGE=${CLIENT_LANGUAGE:-typescript}
 export CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-java}
+export TEST_NETWORK_CHAINCODE_BUILDER=${CHAINCODE_BUILDER:-ccaas}
 
 # Fabric version and Docker registry source: use the latest stable tag image from JFrog
 export FABRIC_VERSION=${FABRIC_VERSION:-2.4}
@@ -70,7 +71,7 @@ function createNetwork() {
   ./network channel create
 
   print "Deploying chaincode"
-  ./network chaincode deploy asset-transfer-basic basic_1.0 $TEST_NETWORK_CHAINCODE_PATH
+  ./network chaincode deploy $CHAINCODE_NAME $TEST_NETWORK_CHAINCODE_PATH
 }
 
 function stopNetwork() {

diff --git a/test-network-k8s/.gitignore b/test-network-k8s/.gitignore
@@ -4,3 +4,4 @@ network-debug.log
 build/
 .env
 bin/
+*.tgz
diff --git a/test-network-k8s/README.md b/test-network-k8s/README.md
@@ -45,7 +45,7 @@ Launch the network, create a channel, and deploy the [basic-asset-transfer](../a
 
 ./network channel create
 
-./network chaincode deploy asset-transfer-basic basic_1.0 $PWD/../asset-transfer-basic/chaincode-java
+./network chaincode deploy asset-transfer-basic ../asset-transfer-basic/chaincode-java
 ```
 
 Invoke and query chaincode:

diff --git a/test-network-k8s/config/org1/core.yaml b/test-network-k8s/config/org1/core.yaml
@@ -558,11 +558,18 @@ chaincode:
     # chaincode. The external builder detection processing will iterate over the
     # builders in the order specified below.
     externalBuilders:
-       - name: ccaas_builder
-         path: /opt/hyperledger/ccaas_builder
-         propagateEnvironment:
-           - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
-
+      - name: ccaas_builder
+        path: /opt/hyperledger/ccaas_builder
+        propagateEnvironment:
+          - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
+
+        # copied into the /var persistent volume share by "network up"
+      - name: k8s_builder
+        path: /var/hyperledger/fabric/external_builders/k8s_builder
+        propagateEnvironment:
+          - CORE_PEER_ID
+          - KUBERNETES_SERVICE_HOST
+          - KUBERNETES_SERVICE_PORT
 
     # The maximum duration to wait for the chaincode build and install process
     # to complete.

diff --git a/test-network-k8s/config/org2/core.yaml b/test-network-k8s/config/org2/core.yaml
@@ -558,11 +558,19 @@ chaincode:
     # chaincode. The external builder detection processing will iterate over the
     # builders in the order specified below.
     externalBuilders:
-       - name: ccaas_builder
-         path: /opt/hyperledger/ccaas_builder
-         propagateEnvironment:
-           - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
-
+      - name: ccaas_builder
+        path: /opt/hyperledger/ccaas_builder
+        propagateEnvironment:
+          - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG
+
+        # copied into the /var persistent volume share by "network up"
+      - name: k8s_builder
+        path: /var/hyperledger/fabric/external_builders/k8s_builder
+        propagateEnvironment:
+          - CORE_PEER_ID
+          - KUBERNETES_SERVICE_HOST
+          - KUBERNETES_SERVICE_PORT
+
     # The maximum duration to wait for the chaincode build and install process
     # to complete.
     installTimeout: 300s

diff --git a/test-network-k8s/docs/CHAINCODE_AS_A_SERVICE.md b/test-network-k8s/docs/CHAINCODE_AS_A_SERVICE.md
@@ -28,7 +28,7 @@ network up
 network channel create
 ```
 ```
-network chaincode deploy    asset-transfer-basic basic_1.0 ${PWD}
+network chaincode deploy    asset-transfer-basic ${PWD}
 ```
 ```
 network chaincode metadata  asset-transfer-basic
@@ -55,7 +55,7 @@ kind load docker-image fabric-samples/asset-transfer-basic/chaincode-java
 
 ```shell
 # Assemble the chaincode package archive 
-network chaincode package basic_1.0 asset-transfer-basic $PWD/build/asset-transfer.tgz
+network chaincode package asset-transfer-basic asset-transfer-basic $PWD/build/asset-transfer.tgz
 
 # Determine the ID for the chaincode package 
 CORE_CHAINCODE_ID_NAME=$(network chaincode id $PWD/build/asset-transfer.tgz)

diff --git a/test-network-k8s/kube/fabric-builder-role.yaml b/test-network-k8s/kube/fabric-builder-role.yaml
@@ -0,0 +1,23 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: fabric-builder-role
+rules:
+  - apiGroups:
+      - ""
+      - apps
+    resources:
+      - pods
+      - deployments
+      - configmaps
+      - secrets
+    verbs:
+      - get
+      - watch
+      - create
diff --git a/test-network-k8s/kube/fabric-builder-rolebinding.yaml b/test-network-k8s/kube/fabric-builder-rolebinding.yaml
@@ -0,0 +1,18 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: fabric-builder-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: fabric-builder-role
+subjects:
+  - namespace: ${NS}
+    kind: ServiceAccount
+    name: default
diff --git a/test-network-k8s/kube/org1/org1-install-k8s-builder.yaml b/test-network-k8s/kube/org1/org1-install-k8s-builder.yaml
@@ -0,0 +1,33 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: org1-install-k8s-builder
+spec:
+  backoffLimit: 0
+  completions: 1
+  template:
+    metadata:
+      name: org1-install-k8s-builder
+    spec:
+      restartPolicy: "Never"
+      containers:
+        - name: main
+          image: ghcr.io/hyperledgendary/k8s-fabric-peer:${K8S_CHAINCODE_BUILDER_VERSION}
+          imagePullPolicy: IfNotPresent
+          command:
+            - sh
+            - -c
+            - "mkdir -p /mnt/fabric-org1/fabric/external_builders && cp -rv /opt/hyperledger/k8s_builder /mnt/fabric-org1/fabric/external_builders/"
+          volumeMounts:
+            - name: fabric-org1-volume
+              mountPath: /mnt/fabric-org1
+      volumes:
+        - name: fabric-org1-volume
+          persistentVolumeClaim:
+            claimName: fabric-org1
diff --git a/test-network-k8s/kube/org2/org2-install-k8s-builder.yaml b/test-network-k8s/kube/org2/org2-install-k8s-builder.yaml
@@ -0,0 +1,33 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: org2-install-k8s-builder
+spec:
+  backoffLimit: 0
+  completions: 1
+  template:
+    metadata:
+      name: org2-install-k8s-builder
+    spec:
+      restartPolicy: "Never"
+      containers:
+        - name: main
+          image: ghcr.io/hyperledgendary/k8s-fabric-peer:${K8S_CHAINCODE_BUILDER_VERSION}
+          imagePullPolicy: IfNotPresent
+          command:
+            - sh
+            - -c
+            - "mkdir -p /mnt/fabric-org2/fabric/external_builders && cp -rv /opt/hyperledger/k8s_builder /mnt/fabric-org2/fabric/external_builders/"
+          volumeMounts:
+            - name: fabric-org2-volume
+              mountPath: /mnt/fabric-org2
+      volumes:
+        - name: fabric-org2-volume
+          persistentVolumeClaim:
+            claimName: fabric-org2
diff --git a/test-network-k8s/network b/test-network-k8s/network
@@ -30,8 +30,10 @@ export CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind}
 export NS=${TEST_NETWORK_KUBE_NAMESPACE:-${NETWORK_NAME}}
 export DOMAIN=${TEST_NETWORK_DOMAIN:-vcap.me}
 export CHANNEL_NAME=${TEST_NETWORK_CHANNEL_NAME:-mychannel}
-export ORDERER_TIMEOUT=${TEST_NETWORK_ORDERER_TIMEOUT:-10s}     # see https://github.com/hyperledger/fabric/issues/3372
+export ORDERER_TIMEOUT=${TEST_NETWORK_ORDERER_TIMEOUT:-10s}         # see https://github.com/hyperledger/fabric/issues/3372
 export TEMP_DIR=${PWD}/build
+export CHAINCODE_BUILDER=${TEST_NETWORK_CHAINCODE_BUILDER:-ccaas}   # see https://github.com/hyperledgendary/fabric-builder-k8s/blob/main/docs/TEST_NETWORK_K8S.md
+export K8S_CHAINCODE_BUILDER_VERSION=${TEST_NETWORK_K8S_CHAINCODE_BUILDER_VERSION:-v0.4.0}
 
 LOG_FILE=${TEST_NETWORK_LOG_FILE:-network.log}
 DEBUG_FILE=${TEST_NETWORK_DEBUG_FILE:-network-debug.log}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ network-debug.log @@
     build/
     .env
     bin/
+    *.tgz