[besu] remove chart version from labels

Signed-off-by: Roy,Sownak <[email protected]>
hyperledger-bevel · Jan 22, 2024 · a7195d5 · a7195d5
1 parent 1e20a28
commit a7195d5
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 14 deletions.
diff --git a/platforms/hyperledger-besu/charts/besu-cacti-connector/templates/configmap.yaml b/platforms/hyperledger-besu/charts/besu-cacti-connector/templates/configmap.yaml
@@ -12,7 +12,6 @@ metadata:
   namespace: {{ .Values.metadata.namespace }}
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}-plugins
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     {{- include "labels.custom" . | nindent 2 }}

diff --git a/platforms/hyperledger-besu/charts/besu-cacti-connector/templates/deployment.yaml b/platforms/hyperledger-besu/charts/besu-cacti-connector/templates/deployment.yaml
@@ -12,7 +12,6 @@ metadata:
   labels:
     app: {{ .Release.Name }}
     app.kubernetes.io/name: {{ .Release.Name }}-cactus-connector
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
     {{- include "labels.custom" . | nindent 2 }}
@@ -23,7 +22,6 @@ spec:
       app: {{ .Release.Name }}
       name: {{ .Release.Name }}-cactus-connector
       app.kubernetes.io/name: {{ .Release.Name }}-cactus-connector
-      helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
       app.kubernetes.io/instance: {{ .Release.Name }} 
       {{- include "labels.custom" . | nindent 2 }}
@@ -33,7 +31,6 @@ spec:
         app: {{ .Release.Name }}
         name: {{ .Release.Name }}-cactus-connector
         app.kubernetes.io/name: {{ .Release.Name }}-cactus-connector
-        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/instance: {{ .Release.Name }} 
         {{- include "labels.custom" . | nindent 2 }}

diff --git a/platforms/hyperledger-besu/charts/besu-cacti-connector/templates/service.yaml b/platforms/hyperledger-besu/charts/besu-cacti-connector/templates/service.yaml
@@ -13,7 +13,6 @@ metadata:
   annotations:
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}-svc
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }} 
     {{- include "labels.custom" . | nindent 2 }}

diff --git a/platforms/hyperledger-besu/charts/besu-node/Chart.yaml b/platforms/hyperledger-besu/charts/besu-node/Chart.yaml
@@ -6,7 +6,7 @@
 apiVersion: v1
 name: besu-node
 description: Hyperledger Besu nodes for a POA network
-version: 1.0.0
+version: 1.0.1
 appVersion: latest
 keywords:
   - bevel

diff --git a/platforms/hyperledger-besu/charts/besu-node/templates/node-service.yaml b/platforms/hyperledger-besu/charts/besu-node/templates/node-service.yaml
@@ -59,7 +59,6 @@ metadata:
   name: {{ include "besu-node.fullname" . }}-servicemonitor
   labels:
     release: monitoring
-    helm.sh/chart: {{ include "besu-node.chart" . }}
     app: {{ template "besu-node.fullname" . }}
     chart: {{ template "besu-node.chart" . }}
     heritage: {{ .Release.Service }}

diff --git a/platforms/hyperledger-besu/charts/besu-node/templates/node-statefulset.yaml b/platforms/hyperledger-besu/charts/besu-node/templates/node-statefulset.yaml
@@ -169,9 +169,9 @@ spec:
             exec
             /opt/besu/bin/besu \
               --config-file=/etc/besu/config.toml \
-              --identity={{ .Values.node.besu.identity | quote }} \
+              --identity={{ .Values.node.besu.identity | quote }} --miner-enabled=false \
               --Xdns-enabled=true --Xdns-update-enabled=true --Xnat-kube-service-name={{ include "besu-node.fullname" . }} \
-              --min-gas-price=0 
+              --min-gas-price=0
 
         livenessProbe:
           httpGet:

diff --git a/platforms/hyperledger-besu/charts/besu-tessera-node/Chart.yaml b/platforms/hyperledger-besu/charts/besu-tessera-node/Chart.yaml
@@ -6,7 +6,7 @@
 apiVersion: v1
 name: besu-tessera-node
 description: "Hyperledger Besu: Deploys Tessera transaction manager nodes"
-version: 1.0.0
+version: 1.0.1
 # Tessera version 
 appVersion: '21.7.3'
 keywords:

diff --git a/platforms/hyperledger-besu/charts/besu-tessera-node/templates/_helpers.tpl b/platforms/hyperledger-besu/charts/besu-tessera-node/templates/_helpers.tpl
@@ -58,4 +58,3 @@ Client URL is defaulted to http; tls certificates need to be checked for using h
 {{- $port := .Values.tessera.q2tport | int -}}
 {{- printf "http://%s.%s:%d" $fullname .Release.Namespace $port | quote }}
 {{- end -}}
-{{- end -}}
diff --git a/platforms/hyperledger-besu/charts/besu-tlscert-gen/templates/job.yaml b/platforms/hyperledger-besu/charts/besu-tlscert-gen/templates/job.yaml
@@ -14,7 +14,6 @@ metadata:
   labels:
     app: "{{ include "besu-tlscert-gen.name" . }}"
     app.kubernetes.io/name: "{{ include "besu-tlscert-gen.name" . }}"
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     {{- if $.Values.labels }}
@@ -31,7 +30,6 @@ spec:
       labels:
         app: "{{ include "besu-tlscert-gen.name" . }}"
         app.kubernetes.io/name: "{{ include "besu-tlscert-gen.name" . }}"
-        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         app.kubernetes.io/instance: {{ .Release.Name }}
         {{- if $.Values.labels }}
@@ -214,7 +212,7 @@ spec:
                 echo "changeme" > besu-password
                 openssl x509 -in certchain.pem -noout -fingerprint -sha256 > besu-certchain-sha256
                 export DIGEST=$(awk '{print $2}' besu-certchain-sha256 | sed -n 's/Fingerprint=\(.*\)/\1/p')
-                printf '%s\n' "tessera.${COMPONENT_NS}:${TM_CLIENT_PORT} $DIGEST" "${EXTERNAL_URL} $DIGEST" > besu-knownServer
+                printf '%s\n' "tessera-*.${COMPONENT_NS}:${TM_CLIENT_PORT} $DIGEST" "${EXTERNAL_URL} $DIGEST" > besu-knownServer
               fi;
             fi;
             # Create necessary subdirectories for certificate storage