try to fix pipeline

Signed-off-by: David VIEJO <dviejo@kungfusoftware.es>
hyperledger-bevel · Oct 14, 2024 · 7d06dd4 · 7d06dd4
1 parent 5dbf826
commit 7d06dd4
Showing 1 changed file with 83 additions and 13 deletions.
diff --git a/.github/workflows/test-kubectl-plugin.yml b/.github/workflows/test-kubectl-plugin.yml
@@ -222,6 +222,8 @@ jobs:
           # enroll using the TLS CA
           kubectl hlf ca enroll --name=ord-ca --namespace=default --user=admin --secret=adminpw --mspid OrdererMSP \
                   --ca-name tlsca  --output admin-tls-ordservice.yaml 
+          kubectl hlf ca enroll --name=ord-ca --namespace=default --user=admin --secret=adminpw --mspid OrdererMSP \
+                  --ca-name ca  --output admin-sign-ordservice.yaml 
 
       - name: Prepare connection string for Peer
         run: |
@@ -240,22 +242,90 @@ jobs:
 
           kubectl create secret generic wallet --namespace=default \
                   --from-file=peer-org1.yaml=$PWD/peer-org1.yaml \
+                  --from-file=admin-sign-ordservice.yaml=$PWD/admin-sign-ordservice.yaml \
                   --from-file=admin-tls-ordservice.yaml=$PWD/admin-tls-ordservice.yaml
           kubectl get fabricorderernodes ord-node1 -o jsonpath='{.status.tlsCert}' > ./orderer-cert.pem
 
-          kubectl hlf channelcrd main create \
-              --channel-name=demo \
-              --name=demo \
-              --orderer-orgs=OrdererMSP \
-              --peer-orgs=Org1MSP \
-              --admin-orderer-orgs=OrdererMSP \
-              --admin-peer-orgs=Org1MSP \
-              --secret-name=wallet \
-              --secret-ns=default \
-              --consenters=orderer0-ord.localho.st:7050 \
-              --consenter-certificates=./orderer-cert.pem \
-              --identities="OrdererMSP;admin-tls-ordservice.yaml" \
-              --identities="Org1MSP;peer-org1.yaml"
+          kubectl apply -f - <<EOF
+          apiVersion: hlf.kungfusoftware.es/v1alpha1
+          kind: FabricMainChannel
+          metadata:
+            name: demo2
+          spec:
+            name: demo2
+            adminOrdererOrganizations:
+              - mspID: OrdererMSP
+            adminPeerOrganizations:
+              - mspID: Org1MSP
+            channelConfig:
+              application:
+                acls: null
+                capabilities:
+                  - V2_0
+                  - V2_5
+                policies: null
+              capabilities:
+                - V2_0
+              orderer:
+                batchSize:
+                  absoluteMaxBytes: 1048576
+                  maxMessageCount: 10
+                  preferredMaxBytes: 524288
+                batchTimeout: 2s
+                capabilities:
+                  - V2_0
+                etcdRaft:
+                  options:
+                    electionTick: 10
+                    heartbeatTick: 1
+                    maxInflightBlocks: 5
+                    snapshotIntervalSize: 16777216
+                    tickInterval: 500ms
+                ordererType: etcdraft
+                policies: null
+                state: STATE_NORMAL
+              policies: null
+            externalOrdererOrganizations: []
+            externalPeerOrganizations: []
+            peerOrganizations:
+              - mspID: Org1MSP
+                caName: "org1-ca"
+                caNamespace: "default"
+            identities:
+              OrdererMSP:
+                secretKey: admin-tls-ordservice.yaml
+                secretName: wallet
+                secretNamespace: default
+              OrdererMSP-tls:
+                secretKey: admin-tls-ordservice.yaml
+                secretName: wallet
+                secretNamespace: default
+              OrdererMSP-sign:
+                secretKey: admin-sign-ordservice.yaml
+                secretName: wallet
+                secretNamespace: default
+              Org1MSP:
+                secretKey: peer-org1.yaml
+                secretName: wallet
+                secretNamespace: default
+
+            ordererOrganizations:
+              - caName: "ord-ca"
+                caNamespace: "default"
+                externalOrderersToJoin:
+                  - host: ord-node1.default
+                    port: 7053
+                mspID: OrdererMSP
+                ordererEndpoints:
+                  - orderer0-ord.localho.st:443
+                orderersToJoin: []
+            orderers:
+              - host: orderer0-ord.localho.st
+                port: 443
+                tlsCert: |-
+          ${ORDERER0_TLS_CERT}
+
+          EOF
 
           kubectl wait --timeout=240s --for=condition=RUNNING fabricmainchannels.hlf.kungfusoftware.es --all