added support for labels in fabric network

Signed-off-by: Aditya Joshi <adityaprakashjoshi1@gmail.com>
hyperledger · Mar 21, 2024 · 4e8a6fa · 4e8a6fa
1 parent bc3f000
commit 4e8a6fa
Show file tree

Hide file tree

Showing 41 changed files with 476 additions and 13 deletions.
diff --git a/docs/source/guides/networkyaml-fabric.md b/docs/source/guides/networkyaml-fabric.md
@@ -74,6 +74,7 @@ The fields under `env` section are
 | retry_count       | Retry count for the checks. |
 |external_dns       | If the cluster has the external DNS service, this has to be set `enabled` so that the hosted zone is automatically updated. |
 |annotations| Use this to pass additional annotations to the `service`, `deployment` and `pvc` elements of Kubernetes|
+|labels| Use this to pass additional labels to the `service`, `deployment` and `pvc` elements of Kubernetes|
 
 
 <a name="docker"></a>

diff --git a/platforms/hyperledger-fabric/charts/fabric-ca-server/templates/_helpers.tpl b/platforms/hyperledger-fabric/charts/fabric-ca-server/templates/_helpers.tpl
@@ -2,4 +2,34 @@
   {{ range $key, $val := $.Values.metadata.labels }}
   {{ $key }}: {{ $val }}
   {{ end }}
-{{- end }}
+{{- end }}
+
+{{- define "labels.deployment" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.deployment }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.service" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.service }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.pvc" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.pvc }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/platforms/hyperledger-fabric/charts/fabric-ca-server/templates/deployment.yaml b/platforms/hyperledger-fabric/charts/fabric-ca-server/templates/deployment.yaml
@@ -16,6 +16,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
     {{- include "labels.custom" . | nindent 2 }}
+    {{- include "labels.deployment" . | nindent 2 }}
   annotations:
     {{- if $.Values.annotations }}
     {{- range $key, $value := $.Values.deployment.annotations }}
@@ -40,6 +41,7 @@ spec:
         helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}  
         app.kubernetes.io/instance: {{ .Release.Name }} 
+        {{- include "labels.deployment" . | nindent 6 }}
     spec:
       serviceAccountName: {{ $.Values.vault.serviceaccountname }}
       {{- if .Values.vault.imagesecretname }}

diff --git a/platforms/hyperledger-fabric/charts/fabric-ca-server/templates/service.yaml b/platforms/hyperledger-fabric/charts/fabric-ca-server/templates/service.yaml
@@ -24,6 +24,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
     {{- include "labels.custom" . | nindent 2 }}
+    {{- include "labels.service" . | nindent 2 }}
 spec:
   type: {{ $.Values.service.servicetype }}
   selector:

diff --git a/platforms/hyperledger-fabric/charts/fabric-ca-server/templates/volume.yaml b/platforms/hyperledger-fabric/charts/fabric-ca-server/templates/volume.yaml
@@ -16,6 +16,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
     {{- include "labels.custom" . | nindent 2 }}
+    {{- include "labels.pvc" . | nindent 2 }}
   annotations:
     {{- if $.Values.annotations }}
     {{- range $key, $value := $.Values.annotations.pvc }}

diff --git a/platforms/hyperledger-fabric/charts/fabric-ca-server/values.yaml b/platforms/hyperledger-fabric/charts/fabric-ca-server/values.yaml
@@ -76,12 +76,11 @@ vault:
   imagesecretname: ""
   #Enable or disable TLS for vault communication
   #Eg. tls: true
-  tls: 
+  tls:
   #kuberenetes secret for vault ca.cert
   #Eg. tlssecret: vaultca
   tlssecret: vaultca
 
-
 service:
   #Provide service type for the pod
   #Eg. servicetype: NodePort
@@ -90,7 +89,7 @@ service:
     tcp:
       #Provide tcp node port to be exposed for ca server
       #Eg. nodeport: 30007
-      nodeport: 
+      nodeport:
       #Provide tcp cluster IP port to be exposed for ca server
       #Eg. clusteripport: 7054
       clusteripport: 7054
@@ -111,3 +110,8 @@ proxy:
   #This field specifies the external url for the organization
   #Eg. external_url_suffix: org1proxy.blockchaincloudpoc.com
   external_url_suffix: org1proxy.blockchaincloudpoc.com
+
+labels:
+  service: []
+  pvc: []
+  deployment: []
diff --git a/platforms/hyperledger-fabric/charts/fabric-catools/templates/_helpers.tpl b/platforms/hyperledger-fabric/charts/fabric-catools/templates/_helpers.tpl
@@ -3,3 +3,33 @@
   {{ $key }}: {{ $val }}
   {{ end }}
 {{- end }}
+
+{{- define "labels.deployment" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.deployment }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.service" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.service }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.pvc" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.pvc }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/platforms/hyperledger-fabric/charts/fabric-catools/templates/deployment.yaml b/platforms/hyperledger-fabric/charts/fabric-catools/templates/deployment.yaml
@@ -16,6 +16,7 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    {{ include "labels.deployment" . | nindent 2 }}  
   annotations:
     {{- if $.Values.annotations }}
     {{- range $key, $value := $.Values.annotations.deployment }}
@@ -33,6 +34,7 @@ spec:
     metadata:
       labels:
         name: {{ .Values.metadata.name }}
+        {{ include "labels.deployment" . | nindent 6 }}  
     spec:
       serviceAccountName: {{ $.Values.vault.serviceaccountname }}
       {{- if .Values.vault.imagesecretname }}

diff --git a/platforms/hyperledger-fabric/charts/fabric-catools/templates/volume.yaml b/platforms/hyperledger-fabric/charts/fabric-catools/templates/volume.yaml
@@ -18,6 +18,8 @@ metadata:
     {{- end }}
     {{- end }}
     {{- end }}    
+  labels:
+    {{ include "labels.pvc" . | nindent 2 }}  
 spec:
   storageClassName: {{ $.Values.storage.storageclassname }}
   accessModes:
@@ -40,6 +42,8 @@ metadata:
     {{- end }}
     {{- end }}
     {{- end }}    
+  labels:
+    {{ include "labels.pvc" . | nindent 2 }}     
 spec:
   storageClassName: {{ $.Values.storage.storageclassname }}
   accessModes:

diff --git a/platforms/hyperledger-fabric/charts/fabric-catools/values.yaml b/platforms/hyperledger-fabric/charts/fabric-catools/values.yaml
@@ -142,3 +142,8 @@ checks:
   refresh_cert_value: false
   #Add a peer to an existing network
   add_peer_value: False
+
+labels:
+  service: []
+  pvc: []
+  deployment: []
diff --git a/platforms/hyperledger-fabric/charts/fabric-cli/templates/_helpers.tpl b/platforms/hyperledger-fabric/charts/fabric-cli/templates/_helpers.tpl
@@ -3,3 +3,33 @@
   {{ $key }}: {{ $val }}
   {{ end }}
 {{- end }}
+
+{{- define "labels.deployment" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.deployment }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.service" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.service }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.pvc" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.pvc }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/platforms/hyperledger-fabric/charts/fabric-cli/templates/deployment.yaml b/platforms/hyperledger-fabric/charts/fabric-cli/templates/deployment.yaml
@@ -9,6 +9,8 @@ kind: Deployment
 metadata:
   name: {{ .Values.peer.name }}-cli
   namespace: {{ .Values.metadata.namespace }}
+  labels:
+    {{ include "labels.deployment" . | nindent 2 }}
 spec:
   replicas: 1
   selector:
@@ -18,6 +20,7 @@ spec:
     metadata:
       labels:
         app: cli
+        {{ include "labels.deployment" . | nindent 6 }}
     spec:
       serviceAccountName: {{ $.Values.vault.serviceaccountname }}
       {{- if .Values.vault.imagesecretname }}

diff --git a/platforms/hyperledger-fabric/charts/fabric-cli/templates/volume.yaml b/platforms/hyperledger-fabric/charts/fabric-cli/templates/volume.yaml
@@ -10,6 +10,8 @@ apiVersion: v1
 metadata:
   name: {{ $.Values.peer.name }}-cli-pvc
   namespace: {{ $.Values.metadata.namespace }}
+  labels:
+    {{ include "labels.pvc" . | nindent 2 }}
 spec:
   storageClassName: {{ $.Values.storage.class }}
   accessModes:

diff --git a/platforms/hyperledger-fabric/charts/fabric-cli/values.yaml b/platforms/hyperledger-fabric/charts/fabric-cli/values.yaml
@@ -74,3 +74,8 @@ orderer:
   #Provide the address for orderer
   #Eg. address: orderer1.org1proxy.blockchaincloudpoc.com:443
   address: orderer1.org1proxy.blockchaincloudpoc.com:443
+
+labels:
+  service: []
+  pvc: []
+  deployment: []
diff --git a/platforms/hyperledger-fabric/charts/fabric-external-chaincode/templates/_helpers.tpl b/platforms/hyperledger-fabric/charts/fabric-external-chaincode/templates/_helpers.tpl
@@ -2,4 +2,34 @@
   {{ range $key, $val := $.Values.metadata.labels }}
   {{ $key }}: {{ $val }}
   {{ end }}
+{{- end }}
+
+{{- define "labels.deployment" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.deployment }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.service" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.service }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.pvc" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.pvc }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/platforms/hyperledger-fabric/charts/fabric-external-chaincode/templates/deployment.yaml b/platforms/hyperledger-fabric/charts/fabric-external-chaincode/templates/deployment.yaml
@@ -17,6 +17,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     {{- include "labels.custom" . | nindent 2 }}
+    {{- include "labels.deployment" . | nindent 2 }}
 spec:
   replicas: 1
   selector:
@@ -32,6 +33,7 @@ spec:
         app.kubernetes.io/name: cc-{{ $.Values.chaincode.name }}
         helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- include "labels.deployment" . | nindent 6 }}
     spec:   
       serviceAccountName: {{ $.Values.vault.serviceaccountname }}
       {{- if .Values.vault.imagesecretname }}

diff --git a/platforms/hyperledger-fabric/charts/fabric-external-chaincode/templates/service.yaml b/platforms/hyperledger-fabric/charts/fabric-external-chaincode/templates/service.yaml
@@ -17,6 +17,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     {{- include "labels.custom" . | nindent 2 }}
+    {{- include "labels.service" . | nindent 2 }}
 spec:
   type: {{ $.Values.service.servicetype }}
   selector:

diff --git a/platforms/hyperledger-fabric/charts/fabric-external-chaincode/values.yaml b/platforms/hyperledger-fabric/charts/fabric-external-chaincode/values.yaml
@@ -74,3 +74,8 @@ service:
       #Provide a cluster IP port for grpc service to be exposed
       #Eg. clusteripport: 7051
       clusteripport: 7052
+
+labels:
+  service: []
+  pvc: []
+  deployment: []
diff --git a/platforms/hyperledger-fabric/charts/fabric-operations-console/templates/_helpers.tpl b/platforms/hyperledger-fabric/charts/fabric-operations-console/templates/_helpers.tpl
@@ -2,4 +2,34 @@
   {{ range $key, $val := $.Values.metadata.labels }}
   {{ $key }}: {{ $val }}
   {{ end }}
-{{- end }}
+{{- end }}
+
+{{- define "labels.deployment" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.deployment }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.service" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.service }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "labels.pvc" -}}
+{{- if $.Values.labels }}
+{{- range $key, $value := $.Values.labels.pvc }}
+{{- range $k, $v := $value }}
+  {{ $k }}: {{ $v | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/platforms/hyperledger-fabric/charts/fabric-operations-console/templates/deployment.yaml b/platforms/hyperledger-fabric/charts/fabric-operations-console/templates/deployment.yaml
@@ -16,6 +16,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     {{- include "labels.custom" . | nindent 2 }}
+    {{ include "labels.deployment" . | nindent 2 }}
   annotations:
     {{- if $.Values.annotations }}
     {{- range $key, $value := $.Values.annotations.deployment }}
@@ -44,6 +45,7 @@ spec:
         app.kubernetes.io/name: {{ $.Values.service.name }}
         helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+        {{ include "labels.deployment" . | nindent 6 }}
     spec:   
       serviceAccountName: {{ $.Values.service.serviceaccountname }}
       {{- if .Values.service.imagesecretname }}

diff --git a/platforms/hyperledger-fabric/charts/fabric-operations-console/templates/pvc.yaml b/platforms/hyperledger-fabric/charts/fabric-operations-console/templates/pvc.yaml
@@ -15,6 +15,7 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    {{ include "labels.pvc" . | nindent 2 }}
   annotations:
     {{- if $.Values.annotations }}
     {{- range $key, $value := $.Values.annotations.pvc }}

diff --git a/platforms/hyperledger-fabric/charts/fabric-operations-console/templates/service.yaml b/platforms/hyperledger-fabric/charts/fabric-operations-console/templates/service.yaml
@@ -29,6 +29,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     {{- include "labels.custom" . | nindent 2 }}
+    {{ include "labels.service" . | nindent 2 }}
 spec:
   type: {{ $.Values.service.servicetype }}
   selector: