Support for identiy create registering users

FabricIdentity secret ref for in cluster CA
hyperledger-bevel · Dec 22, 2023 · 4cdab0e · 4cdab0e
1 parent c2bfde6
commit 4cdab0e
Show file tree

Hide file tree

Showing 17 changed files with 1,857 additions and 164 deletions.
diff --git a/api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go b/api/hlf.kungfusoftware.es/v1alpha1/hlf_types.go
@@ -134,6 +134,11 @@ type GRPCProxy struct {
 	// +nullable
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets"`
 }
+type AddressOverride struct {
+	From        string `json:"from"`
+	To          string `json:"to"`
+	CACertsFile string `json:"caCertsFile"`
+}
 
 // FabricPeerSpec defines the desired state of FabricPeer
 type FabricPeerSpec struct {
@@ -148,6 +153,23 @@ type FabricPeerSpec struct {
 	// +kubebuilder:default:={}
 	PodLabels map[string]string `json:"podLabels"`
 
+	// +nullable
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default:={}
+	DeliveryClientaddressOverrides []AddressOverride `json:"deliveryClientaddressOverrides"`
+	// +optional
+	// +nullable
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default:={}
+	Volumes []corev1.Volume `json:"volumes"`
+
+	// +optional
+	// +nullable
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default:={}
+	PeerVolumeMounts []corev1.VolumeMount `json:"peerVolumeMounts"`
+
 	// +optional
 	// +nullable
 	UpdateCertificateTime *metav1.Time `json:"updateCertificateTime"`

diff --git a/api/hlf.kungfusoftware.es/v1alpha1/zz_generated.deepcopy.go b/api/hlf.kungfusoftware.es/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/hlf-peer/templates/configmap--peer--core.yaml b/charts/hlf-peer/templates/configmap--peer--core.yaml
@@ -358,12 +358,9 @@ data:
         # A list of orderer endpoint addresses which should be overridden
         # when found in channel configurations.
         addressOverrides:
-        #  - from:
-        #    to:
-        #    caCertsFile:
-        #  - from:
-        #    to:
-        #    caCertsFile:
+    {{- if $.Values.deliveryClientaddressOverrides }}
+    {{ $.Values.deliveryClientaddressOverrides | toYaml | nindent 10 }}
+    {{- end }}
 
       # Type for the local MSP - by default it's of type bccsp
       localMspType: bccsp

diff --git a/charts/hlf-peer/templates/deployment.yaml b/charts/hlf-peer/templates/deployment.yaml
@@ -42,6 +42,10 @@ spec:
       hostAliases:
 {{ toYaml .Values.hostAliases | indent 10 }}
       volumes:
+# range through .Values.volumes
+  {{- if .Values.volumes }}
+{{ toYaml .Values.volumes | nindent 8 }}
+    {{- end }}
         {{- if eq .Values.peer.databaseType "CouchDB" }}
         - name: couchdb
           {{- if and .Values.persistence.couchdb.enabled ( not .Values.couchdb.external.enabled) }}
@@ -246,6 +250,10 @@ spec:
             - configMapRef:
                 name: {{ include "hlf-peer.fullname" . }}--peer
           volumeMounts:
+# range volumeMounts
+  {{- if .Values.volumeMounts }}
+{{ toYaml .Values.peerVolumeMounts | nindent 12 }}
+  {{- end }}
             - name: peerconfig
               mountPath: /var/hyperledger/fabric_cfg
             - mountPath: /var/hyperledger

diff --git a/charts/hlf-peer/values.yaml b/charts/hlf-peer/values.yaml
@@ -118,7 +118,8 @@ resources:
       memory: 128Mi
 replicas: 1
 nodeSelector: { }
-
+volumes: []
+peerVolumeMounts: [ ]
 tolerations: [ ]
 
 affinity: { }
@@ -164,6 +165,8 @@ logging:
 
 externalChaincodeBuilder: false
 
+deliveryClientaddressOverrides: []
+
 externalBuilders: [ ]
 
 proxy: