Merge branch 'feat/extend-types' of https://github.com/hyperledger/be…

…vel-operator-fabric into feat/extend-types

Dockerfile

@@ -1,9 +1,8 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
-
+FROM alpine:3.14
 
 RUN \
-    microdnf update --nodocs && \
-    microdnf install curl ca-certificates shadow-utils --nodocs
+    apk update && \
+    apk add --no-cache curl ca-certificates shadow
 
 COPY CREDITS /licenses/CREDITS
 COPY LICENSE /licenses/LICENSE

README.md

@@ -222,27 +222,27 @@ EOF
 
 ```bash
 export PEER_IMAGE=hyperledger/fabric-peer
-export PEER_VERSION=2.5.9
+export PEER_VERSION=2.5.10
 
 export ORDERER_IMAGE=hyperledger/fabric-orderer
-export ORDERER_VERSION=2.5.9
+export ORDERER_VERSION=2.5.10
 
 export CA_IMAGE=hyperledger/fabric-ca
-export CA_VERSION=1.5.12
+export CA_VERSION=1.5.13
 ```
 
 
 ### Environment Variables for ARM (Mac M1)
 
 ```bash
 export PEER_IMAGE=hyperledger/fabric-peer
-export PEER_VERSION=2.5.9
+export PEER_VERSION=2.5.10
 
 export ORDERER_IMAGE=hyperledger/fabric-orderer
-export ORDERER_VERSION=2.5.9
+export ORDERER_VERSION=2.5.10
 
 export CA_IMAGE=hyperledger/fabric-ca             
-export CA_VERSION=1.5.12
+export CA_VERSION=1.5.13
 
 ```
 
@@ -541,7 +541,6 @@ kubectl hlf identity create --name org2-admin --namespace default \
 ```bash
 kubectl create secret generic wallet --namespace=default \
         --from-file=org1msp.yaml=$PWD/org1msp.yaml \
-        --from-file=org2msp.yaml=$PWD/org2msp.yaml \
         --from-file=orderermsp.yaml=$PWD/orderermsp.yaml \
         --from-file=orderermspsign.yaml=$PWD/orderermspsign.yaml
 
@@ -567,9 +566,9 @@ kubectl apply -f - <<EOF
 apiVersion: hlf.kungfusoftware.es/v1alpha1
 kind: FabricMainChannel
 metadata:
-  name: demo5
+  name: demo
 spec:
-  name: demo5
+  name: demo
   adminOrdererOrganizations:
     - mspID: OrdererMSP
   adminPeerOrganizations:

controllers/followerchannel/followerchannel_controller.go

@@ -401,7 +401,7 @@ func (r *FabricFollowerChannelReconciler) updateCRStatusOrFailReconcile(ctx cont
 	}
 	if p.Status.Status == hlfv1alpha1.FailedStatus {
 		return reconcile.Result{
-			RequeueAfter: 1 * time.Minute,
+			RequeueAfter: 5 * time.Minute,
 		}, nil
 	}
 	return reconcile.Result{

controllers/mainchannel/mainchannel_controller.go

@@ -21,7 +21,6 @@ import (
 	"github.com/hyperledger/fabric-config/protolator"
 	"github.com/hyperledger/fabric-protos-go/common"
 	cb "github.com/hyperledger/fabric-protos-go/common"
-	mspa "github.com/hyperledger/fabric-protos-go/msp"
 	sb "github.com/hyperledger/fabric-protos-go/orderer/smartbft"
 	"github.com/hyperledger/fabric-sdk-go/pkg/client/resmgmt"
 	fab2 "github.com/hyperledger/fabric-sdk-go/pkg/common/providers/fab"
@@ -722,7 +721,7 @@ func (r *FabricMainChannelReconciler) updateCRStatusOrFailReconcile(ctx context.
 	}
 	if p.Status.Status == hlfv1alpha1.FailedStatus {
 		return reconcile.Result{
-			RequeueAfter: 1 * time.Minute,
+			RequeueAfter: 5 * time.Minute,
 		}, nil
 	}
 	return reconcile.Result{}, nil
@@ -1383,10 +1382,7 @@ func updateOrdererChannelConfigTx(currentConfigTX configtx.ConfigTx, newConfigTx
 		return errors.Wrapf(err, "failed to get application configuration")
 	}
 	log.Infof("New config tx: %v", newConfigTx.Orderer)
-	err = currentConfigTX.Orderer().SetConfiguration(newConfigTx.Orderer)
-	if err != nil {
-		return errors.Wrapf(err, "failed to set orderer configuration")
-	}
+
 	currentConfig, err := currentConfigTX.Orderer().Configuration()
 	if err != nil {
 		return errors.Wrapf(err, "failed to get current orderer configuration")
@@ -1433,6 +1429,10 @@ func updateOrdererChannelConfigTx(currentConfigTX configtx.ConfigTx, newConfigTx
 			}
 		}
 	} else if newConfigTx.Orderer.OrdererType == orderer.ConsensusTypeBFT {
+		err = currentConfigTX.Orderer().SetConfiguration(newConfigTx.Orderer)
+		if err != nil {
+			return errors.Wrapf(err, "failed to set orderer configuration")
+		}
 		var consenterMapping []*cb.Consenter
 		for _, consenter := range newConfigTx.Orderer.ConsenterMapping {
 			consenterMapping = append(consenterMapping, &cb.Consenter{
@@ -1449,31 +1449,14 @@ func updateOrdererChannelConfigTx(currentConfigTX configtx.ConfigTx, newConfigTx
 		if err != nil {
 			return errors.Wrapf(err, "failed to set consenter mapping")
 		}
-
-		var identities []*mspa.MSPPrincipal
-		var pols []*cb.SignaturePolicy
-		for i, consenter := range consenterMapping {
-			if consenter == nil {
-				return fmt.Errorf("consenter %d in the mapping is empty", i)
-			}
-			pols = append(pols, &cb.SignaturePolicy{
-				Type: &cb.SignaturePolicy_SignedBy{
-					SignedBy: int32(i),
-				},
-			})
-			identities = append(identities, &mspa.MSPPrincipal{
-				PrincipalClassification: mspa.MSPPrincipal_IDENTITY,
-				Principal:               protoutil.MarshalOrPanic(&mspa.SerializedIdentity{Mspid: consenter.MspId, IdBytes: consenter.Identity}),
-			})
-		}
-	}
-	err = currentConfigTX.Orderer().SetConfiguration(newConfigTx.Orderer)
-	if err != nil {
-		return errors.Wrapf(err, "failed to set orderer configuration")
 	}
 
 	// update
 	if ord.OrdererType == "BFT" {
+		err = currentConfigTX.Orderer().SetConfiguration(newConfigTx.Orderer)
+		if err != nil {
+			return errors.Wrapf(err, "failed to set orderer configuration")
+		}
 		log.Infof("updateOrdererChannelConfigTx: Orderer type: %s", ord.OrdererType)
 		// update policies but blockValidation
 		err = currentConfigTX.Orderer().SetPolicy("Admins", newConfigTx.Orderer.Policies["Admins"])

kubectl-hlf/cmd/chaincode/getlatest.go

@@ -1,14 +1,15 @@
 package chaincode
 
 import (
+	"io"
+	"io/ioutil"
+	"strconv"
+
 	"github.com/hyperledger/fabric-sdk-go/pkg/client/resmgmt"
 	"github.com/hyperledger/fabric-sdk-go/pkg/core/config"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fabsdk"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"io"
-	"io/ioutil"
-	"strconv"
 )
 
 type getLatestInfoCmd struct {
@@ -46,9 +47,14 @@ func (c *getLatestInfoCmd) run(out io.Writer, stdErr io.Writer) error {
 	if err != nil {
 		return err
 	}
+	resmgmtOptions := []resmgmt.RequestOption{}
+	if c.peer != "" {
+		resmgmtOptions = append(resmgmtOptions, resmgmt.WithTargetEndpoints(c.peer))
+	}
 	committedCCs, err := resClient.LifecycleQueryCommittedCC(
 		c.channelName,
 		resmgmt.LifecycleQueryCommittedCCRequest{Name: c.name},
+		resmgmtOptions...,
 	)
 	if err != nil {
 		return err