Merge remote-tracking branch 'origin/main' into feature/register-iden…

…tity-fix Signed-off-by: David VIEJO <[email protected]>
hyperledger-bevel · Jan 3, 2024 · 7aa519f · 7aa519f
2 parents 2f2862d + 62d0028
commit 7aa519f
Show file tree

Hide file tree

Showing 307 changed files with 15,046 additions and 2,963 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,8 @@ bin
 *.swp
 *.swo
 *~
-*.DS_Store
+
+**/.DS_Store
 
 crypto-config
 keystore

diff --git a/README.md b/README.md
@@ -32,19 +32,26 @@ For discussions and questions, please join the Hyperledger Foundation Discord:
 
 The channel is located under `BEVEL`, named [`bevel-operator-fabric`](https://discordapp.com/channels/905194001349627914/967823782712594442).
 
-
 ## Tutorial Videos
 
-Step by step video tutorials to setup hlf-operator in kubernetes
+Step-by-step video tutorials to setup hlf-operator in Kubernetes
 
 [![Hyperledger Fabric on Kubernetes](https://img.youtube.com/vi/e04TcJHUI5M/0.jpg)](https://www.youtube.com/playlist?list=PLuAZTZDgj0csRQuNMY8wbYqOCpzggAuMo "Hyperledger Fabric on Kubernetes")
 
+This workshop provides an in-depth hands on discussion and demonstration of using Bevel and the new Bevel-Operator-Fabric to deploy Hyperledger Fabric on Kubernetes.
+
 ## Hyperledger Meetup
 
-You can watch this video in order to see how to use it to deploy your own network:
+You can watch this video to see how to use it to deploy your own network:
 
 [![Hyperledger Fabric on Kubernetes](http://img.youtube.com/vi/namKDeJf5QI/0.jpg)](http://www.youtube.com/watch?v=namKDeJf5QI "Hyperledger Fabric on Kubernetes")
 
+## Hyperledger Workshops
+
+This workshop provides an in-depth, hands-on discussion and demonstration of using Bevel and the new Bevel-Operator-Fabric to deploy Hyperledger Fabric on Kubernetes.
+
+[![How to Deploy Hyperledger Fabric on Kubernetes with Hyperledger Bevel](https://img.youtube.com/vi/YUC12ahY5_k/0.jpg)](https://www.youtube.com/live/YUC12ahY5_k?feature=share&t=4430)
+
 ## Sponsor
 
 |                                                                         |                                                                                                                                                                                                                               |

diff --git a/api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go b/api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go
@@ -1737,6 +1737,13 @@ type FabricChaincodeSpec struct {
 	// +optional
 	// +kubebuilder:validation:Default={}
 	Env []corev1.EnvVar `json:"env"`
+
+	// +kubebuilder:default=7052
+	ChaincodeServerPort int `json:"chaincodeServerPort"`
+
+	// +optional
+	// +kubebuilder:validation:Optional
+	MspID string `json:"mspID"`
 }
 
 // FabricChaincodeStatus defines the observed state of FabricChaincode

diff --git a/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricchaincodes.yaml b/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricchaincodes.yaml
@@ -869,6 +869,9 @@ spec:
                 items:
                   type: string
                 type: array
+              chaincodeServerPort:
+                default: 7052
+                type: integer
               command:
                 description: Entrypoint array. Not executed within a shell. The container
                   image's ENTRYPOINT is used if this is not provided.
@@ -1056,6 +1059,8 @@ spec:
                   type: object
                 nullable: true
                 type: array
+              mspID:
+                type: string
               packageId:
                 minLength: 1
                 type: string
@@ -1129,6 +1134,7 @@ spec:
                 nullable: true
                 type: array
             required:
+            - chaincodeServerPort
             - image
             - imagePullPolicy
             - packageId

diff --git a/config/crd/bases/hlf.kungfusoftware.es_fabricchaincodes.yaml b/config/crd/bases/hlf.kungfusoftware.es_fabricchaincodes.yaml
@@ -874,6 +874,9 @@ spec:
                 items:
                   type: string
                 type: array
+              chaincodeServerPort:
+                default: 7052
+                type: integer
               command:
                 description: Entrypoint array. Not executed within a shell. The container
                   image's ENTRYPOINT is used if this is not provided.
@@ -1080,6 +1083,8 @@ spec:
                   type: string
                 nullable: true
                 type: object
+              mspID:
+                type: string
               packageId:
                 minLength: 1
                 type: string
@@ -1163,6 +1168,7 @@ spec:
                 nullable: true
                 type: array
             required:
+            - chaincodeServerPort
             - image
             - imagePullPolicy
             - packageId

diff --git a/controllers/chaincode/chaincode_controller.go b/controllers/chaincode/chaincode_controller.go
@@ -50,11 +50,11 @@ func CreateChaincodeCryptoMaterial(conf *hlfv1alpha1.FabricChaincode, caName str
 		TLSCert:    tlsCertString,
 		URL:        caurl,
 		Name:       caName,
-		MSPID:      "Org1MSP",
+		MSPID:      conf.Spec.MspID,
 		User:       enrollID,
 		Secret:     enrollSecret,
 		Hosts:      hosts,
-		CN:         "",
+		CN:         conf.Name,
 		Profile:    "tls",
 		Attributes: nil,
 	})
@@ -312,7 +312,7 @@ func (r *FabricChaincodeReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	}
 	deploymentName := fmt.Sprintf("%s", fabricChaincode.Name)
 	serviceName := fmt.Sprintf("%s", fabricChaincode.Name)
-	chaincodePort := 7052
+	chaincodePort := fabricChaincode.Spec.ChaincodeServerPort
 	chaincodeAddress := fmt.Sprintf("0.0.0.0:%d", chaincodePort)
 	envVars := []corev1.EnvVar{
 		{