Merge branch 'feature/1.9.0-new' of https://github.com/hyperledger/bevel-operator-fabric into feature/1.9.0-new

Signed-off-by: David VIEJO <[email protected]>

Author: dviejokfs

.github/workflows/test-kubectl-plugin.yml

@@ -25,7 +25,7 @@ jobs:
         uses: helm/[email protected]
         with:
           cluster_name: kind
-          node_image: kindest/node:v1.25.0
+          node_image: kindest/node:v1.25.8
           config: .github/kind-config.yaml
 
       - name: Install kubectl plugin
@@ -44,7 +44,7 @@ jobs:
       - name: Deploy operator
         run: |
           helm repo add kfs https://kfsoftware.github.io/hlf-helm-charts --force-update
-          helm install hlf-operator --version=1.8.2 kfs/hlf-operator --set image.repository="${IMAGE}" --set image.tag="${TAG}" --set image.pullPolicy="IfNotPresent"
+          helm install hlf-operator --version=1.9.0-beta4 kfs/hlf-operator --set image.repository="${IMAGE}" --set image.tag="${TAG}" --set image.pullPolicy="IfNotPresent"
 
       - name: Install operator CRDs
         run: |
@@ -169,10 +169,10 @@ jobs:
       - name: Create Peer org
         run: |
           export PEER_IMAGE=hyperledger/fabric-peer
-          export PEER_VERSION=2.4.6
+          export PEER_VERSION=2.5.0
 
           export CA_IMAGE=hyperledger/fabric-ca
-          export CA_VERSION=1.5.6-beta2
+          export CA_VERSION=1.5.6
 
           kubectl hlf ca create --image=$CA_IMAGE --version=$CA_VERSION --storage-class=standard --capacity=2Gi --name=org1-ca \
               --enroll-id=enroll --hosts=org1-ca.localho.st --enroll-pw=enrollpw
@@ -190,10 +190,10 @@ jobs:
       - name: Create Orderer Org
         run: |
           export ORDERER_IMAGE=hyperledger/fabric-orderer
-          export ORDERER_VERSION=2.4.6
+          export ORDERER_VERSION=2.5.0
 
           export CA_IMAGE=hyperledger/fabric-ca
-          export CA_VERSION=1.5.6-beta2
+          export CA_VERSION=1.5.6
 
           kubectl hlf ca create --image=$CA_IMAGE --version=$CA_VERSION --storage-class=standard --capacity=2Gi --name=ord-ca \
               --enroll-id=enroll --enroll-pw=enrollpw --hosts=ord-ca.localho.st

README.md

@@ -73,6 +73,7 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
+  image: kindest/node:v1.25.8
   extraPortMappings:
   - containerPort: 30949
     hostPort: 80
@@ -96,7 +97,7 @@ To install helm: [https://helm.sh/docs/intro/install/](https://helm.sh/docs/intr
 ```bash
 helm repo add kfs https://kfsoftware.github.io/hlf-helm-charts --force-update
 
-helm install hlf-operator --version=1.8.2 kfs/hlf-operator
+helm install hlf-operator --version=1.9.0-beta4 -- kfs/hlf-operator
 ```
 
 
@@ -197,27 +198,27 @@ EOF
 
 ```bash
 export PEER_IMAGE=hyperledger/fabric-peer
-export PEER_VERSION=2.4.6
+export PEER_VERSION=2.5.0
 
 export ORDERER_IMAGE=hyperledger/fabric-orderer
-export ORDERER_VERSION=2.4.6
+export ORDERER_VERSION=2.5.0
 
 export CA_IMAGE=hyperledger/fabric-ca
-export CA_VERSION=1.5.6-beta2
+export CA_VERSION=1.5.6
 ```
 
 
 ### Environment Variables for ARM (Mac M1)
 
 ```bash
-export PEER_IMAGE=bswamina/fabric-peer
-export PEER_VERSION=2.4.6
+export PEER_IMAGE=hyperledger/fabric-peer
+export PEER_VERSION=2.5.0
 
-export ORDERER_IMAGE=bswamina/fabric-orderer
-export ORDERER_VERSION=2.4.6
+export ORDERER_IMAGE=hyperledger/fabric-orderer
+export ORDERER_VERSION=2.5.0
 
 export CA_IMAGE=hyperledger/fabric-ca             
-export CA_VERSION=1.5.6-beta2
+export CA_VERSION=1.5.6
 
 ```
 
@@ -364,41 +365,6 @@ openssl s_client -connect orderer0-ord.localho.st:443
 ```
 
 
-## Prepare connection string to interact with orderer
-
-To prepare the connection string, we have to:
-
-- Get the connection string without users
-- Register a user in the certification authority for signature
-- Get the certificates using the user created above
-- Attach the user to the connection string
-
-1. Get the connection string without users
-
-```bash
-kubectl hlf inspect --output ordservice.yaml -o OrdererMSP
-```
-
-2. Register a user in the TLS certification authority
-
-```bash
-kubectl hlf ca register --name=ord-ca --user=admin --secret=adminpw \
-    --type=admin --enroll-id enroll --enroll-secret=enrollpw --mspid=OrdererMSP
-```
-
-3. Get the certificates using the certificate
-
-```bash
-kubectl hlf ca enroll --name=ord-ca --user=admin --secret=adminpw --mspid OrdererMSP \
-        --ca-name ca  --output admin-ordservice.yaml
-```
-
-4. Attach the user to the connection string
-
-```
-kubectl hlf utils adduser --userPath=admin-ordservice.yaml --config=ordservice.yaml --username=admin --mspid=OrdererMSP
-```
-
 ## Create channel
 
 To create the channel we need to first create the wallet secret, which will contain the identities used by the operator to manage the channel

api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go

@@ -18,6 +18,7 @@ package v1alpha1
 
 import (
 	"fmt"
+
 	"github.com/kfsoftware/hlf-operator/pkg/status"
 	"k8s.io/api/networking/v1beta1"
 	kubeclock "k8s.io/apimachinery/pkg/util/clock"
@@ -317,9 +318,11 @@ type Component struct {
 	External *ExternalCertificate `json:"external"`
 }
 type ExternalCertificate struct {
-	SecretName     string `json:"secretName"`
-	CertificateKey string `json:"certificateKey"`
-	PrivateKeyKey  string `json:"privateKeyKey"`
+	SecretName         string `json:"secretName"`
+	SecretNamespace    string `json:"secretNamespace"`
+	RootCertificateKey string `json:"rootCertificateKey"`
+	CertificateKey     string `json:"certificateKey"`
+	PrivateKeyKey      string `json:"privateKeyKey"`
 }
 
 func (c *Component) CAUrl() string {
@@ -341,6 +344,10 @@ type TLS struct {
 	Csr          Csr    `json:"csr"`
 	Enrollid     string `json:"enrollid"`
 	Enrollsecret string `json:"enrollsecret"`
+
+	// +optional
+	// +nullable
+	External *ExternalCertificate `json:"external"`
 }
 type Enrollment struct {
 	Component Component `json:"component"`
@@ -1429,10 +1436,23 @@ type FabricOperatorAPISpec struct {
 
 // FabricNetworkConfigSpec defines the desired state of FabricNetworkConfig
 type FabricNetworkConfigSpec struct {
-	Organization  string   `json:"organization"`
-	Internal      bool     `json:"internal"`
+	Organization string `json:"organization"`
+
+	Internal bool `json:"internal"`
+
 	Organizations []string `json:"organizations"`
-	SecretName    string   `json:"secretName"`
+
+	Namespaces []string `json:"namespaces"`
+
+	// HLF Identities to be included in the network config
+	Identities []FabricNetworkConfigIdentity `json:"identities"`
+
+	SecretName string `json:"secretName"`
+}
+
+type FabricNetworkConfigIdentity struct {
+	Name      string `json:"name"`
+	Namespace string `json:"namespace"`
 }
 
 // FabricNetworkConfigStatus defines the observed state of FabricNetworkConfig
@@ -1551,6 +1571,56 @@ type FabricChaincodeList struct {
 	Items           []FabricChaincode `json:"items"`
 }
 
+// FabricMainChannelStatus defines the observed state of FabricMainChannel
+type FabricIdentityStatus struct {
+	Conditions status.Conditions `json:"conditions"`
+	Message    string            `json:"message"`
+	// Status of the FabricCA
+	Status DeploymentStatus `json:"status"`
+}
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +k8s:defaulter-gen=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Namespaced,shortName=fabricidentity,singular=fabricidentity
+// +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.status"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +k8s:openapi-gen=true
+
+// FabricIdentity is the Schema for the hlfs API
+type FabricIdentity struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              FabricIdentitySpec   `json:"spec,omitempty"`
+	Status            FabricIdentityStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// FabricIdentityList contains a list of FabricIdentity
+type FabricIdentityList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []FabricIdentity `json:"items"`
+}
+
+// FabricIdentitySpec defines the desired state of FabricIdentity
+type FabricIdentitySpec struct {
+	// +kubebuilder:validation:MinLength=1
+	Cahost string `json:"cahost"`
+	// +kubebuilder:validation:MinLength=1
+	Caname string `json:"caname"`
+	Caport int    `json:"caport"`
+	Catls  Catls  `json:"catls"`
+	// +kubebuilder:validation:MinLength=1
+	Enrollid string `json:"enrollid"`
+	// +kubebuilder:validation:MinLength=1
+	Enrollsecret string `json:"enrollsecret"`
+	// +kubebuilder:validation:MinLength=1
+	MSPID string `json:"mspid"`
+}
+
 // FabricMainChannelStatus defines the observed state of FabricMainChannel
 type FabricMainChannelStatus struct {
 	Conditions status.Conditions `json:"conditions"`
@@ -1616,6 +1686,7 @@ type FabricMainChannelSpec struct {
 	// Consenters are the orderer nodes that are part of the channel consensus
 	Consenters []FabricMainChannelConsenter `json:"orderers"`
 }
+
 type FabricMainChannelAdminPeerOrganizationSpec struct {
 	// MSP ID of the organization
 	MSPID string `json:"mspID"`
@@ -1940,5 +2011,6 @@ func init() {
 	SchemeBuilder.Register(&FabricOperatorUI{}, &FabricOperatorUIList{})
 	SchemeBuilder.Register(&FabricOperatorAPI{}, &FabricOperatorAPIList{})
 	SchemeBuilder.Register(&FabricMainChannel{}, &FabricMainChannelList{})
+	SchemeBuilder.Register(&FabricIdentity{}, &FabricIdentityList{})
 	SchemeBuilder.Register(&FabricFollowerChannel{}, &FabricFollowerChannelList{})
 }