Feat/small feats (#211)

* NetworkConfig: filter the peers to be added per organization

* Filter peers by org, global peers and global CAs

* Add `FabricChaincodeTemplate` CRD

* update

* Add support for FabricChaincodeTemplateRef in FabricChaincodeSpec

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

* update

* Update helm chart in pipelien

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

* Update

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

* update

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

* Update

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

* update

* fabric-config 0.1.0 -> 0.2.1

Add ports 443 for the peer

* Upgrade to go 1.21

* Add adminURL in the network config if available

* Update pipelines to 1.21

* Add command to get the next sequence and version for a chaincode based on chaincode definition

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

* update

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

* update

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

* update

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

* Update peer controller

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

* Update go dependencies

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

* Parametrize responseWaitTime, aliveTimeInterval, aliveExpirationTimeout and reconnectInterval

* Fix ci/cd

* fix ci/cd

* fix error in suite_test

* fix ci/cd

---------

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

Author: dviejokfs

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

@@ -48,7 +48,7 @@ jobs:
 
       - name: Install operator CRDs
         run: |
-          go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0
+          go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
           make generate manifests install
       - name: Install Istio
         run: |

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Install operator
         run: | 
-          go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0
+          go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
           make generate manifests install
 
       - name: Test

Makefile

@@ -14,7 +14,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1"
+CRD_OPTIONS ?= "crd:crdVersions=v1"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

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

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"github.com/kfsoftware/hlf-operator/pkg/status"
 	"k8s.io/api/networking/v1beta1"
-	kubeclock "k8s.io/apimachinery/pkg/util/clock"
+	kubeclock "k8s.io/utils/clock"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -375,6 +375,18 @@ type FabricPeerSpecGossip struct {
 	Endpoint          string `json:"endpoint"`
 	UseLeaderElection bool   `json:"useLeaderElection"`
 	OrgLeader         bool   `json:"orgLeader"`
+	// +kubebuilder:validation:Default=25s
+	// +optional
+	ReconnectInterval string `json:"reconnectInterval"`
+	// +kubebuilder:validation:Default=25s
+	// +optional
+	AliveExpirationTimeout string `json:"aliveExpirationTimeout"`
+	// +kubebuilder:validation:Default=5s
+	// +optional
+	AliveTimeInterval string `json:"aliveTimeInterval"`
+	// +kubebuilder:validation:Default=2s
+	// +optional
+	ResponseWaitTime string `json:"responseWaitTime"`
 }
 type Catls struct {
 	Cacert string `json:"cacert"`

api/hlf.kungfusoftware.es/v1alpha1/zz_generated.deepcopy.go

@@ -162,13 +162,13 @@ data:
         # Should be slightly bigger than digestWaitTime
         requestWaitTime: 1500ms
         # Time to wait before pull engine ends pull (unit: second)
-        responseWaitTime: 2s
+        responseWaitTime: {{.Values.peer.gossip.responseWaitTime | default "2s" }}
         # Alive check interval(unit: second)
-        aliveTimeInterval: 5s
+        aliveTimeInterval: {{.Values.peer.gossip.aliveTimeInterval | default "5s" }}
         # Alive expiration timeout(unit: second)
-        aliveExpirationTimeout: 25s
+        aliveExpirationTimeout: {{.Values.peer.gossip.aliveExpirationTimeout | default "25s"}}
         # Reconnect interval(unit: second)
-        reconnectInterval: 25s
+        reconnectInterval: {{.Values.peer.gossip.reconnectInterval | default "25s"}}
         # Max number of attempts to connect to a peer
         maxConnectionAttempts: 120
         # Message expiration factor for alive messages

charts/hlf-peer/templates/configmap--peer--core.yaml

@@ -56,6 +56,11 @@ peer:
     orgLeader: "false"
     useLeaderElection: "true"
 
+    reconnectInterval: "25s"
+    aliveExpirationTimeout: "25s"
+    aliveTimeInterval: "5s"
+    responseWaitTime: "2s"
+
   tls:
     server:
       enabled: "true"