fix: add per-node and component labels to svcs

fix(tfs-on-sawtooth): per-node and component label fix(sawtooth): per-node and compnent label fix(besu): per-node and component label fix(daml-n-besu): per-node and component label fix(daml-on-sawtooth): per-node and component label fix(sextant): component label fix(daml-on-postgres): component label fix(daml-on-qldb): component-label Signed-off-by: Kevin O'Donnell <kevin@blockchaintp.com>
blockchaintp · Sep 2, 2021 · a281edb · a281edb
1 parent 6f946e2
commit a281edb
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 22 deletions.
diff --git a/charts/besu/Chart.yaml b/charts/besu/Chart.yaml
@@ -19,7 +19,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.0.12
+version: 0.0.13
 
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.

diff --git a/charts/besu/templates/besu-service.yaml b/charts/besu/templates/besu-service.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-{{include "besu.labels" . | indent 4 }}
+  labels: {{include "besu.labels" . | nindent 4 }}
+    component: besu
   name: {{ include "besu.fullname" . }}
   namespace: {{.Release.Namespace}}
 spec:

diff --git a/charts/besu/templates/enode-service.yaml b/charts/besu/templates/enode-service.yaml
@@ -8,8 +8,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-{{ $labels | indent 4}}
+  labels: {{ $labels | nindent 4}}
+    per-node: {{ $name }}-{{.}}
+    component: besu
   name: {{ $name }}-{{ . }}
   namespace: {{ $.Release.Namespace}}
 spec:

diff --git a/charts/daml-on-besu/Chart.yaml b/charts/daml-on-besu/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.0.40
+version: 0.0.41
 
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.

diff --git a/charts/daml-on-besu/templates/besu-service.yaml b/charts/daml-on-besu/templates/besu-service.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-{{include "besu.labels" . | indent 4 }}
+  labels: {{include "besu.labels" . | nindent 4 }}
+    component: besu
   name: {{ include "besu.fullname" . }}
   namespace: {{.Release.Namespace}}
 spec:

diff --git a/charts/daml-on-besu/templates/daml-service.yaml b/charts/daml-on-besu/templates/daml-service.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-{{include "daml.labels" . | indent 4 }}
+  labels: {{include "daml.labels" . | nindent 4 }}
+    component: daml
   name: {{ include "daml.fullname" . }}-rpc
   namespace: {{.Release.Namespace}}
 spec:

diff --git a/charts/daml-on-besu/templates/enode-service.yaml b/charts/daml-on-besu/templates/enode-service.yaml
@@ -8,8 +8,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-{{ $labels | indent 4}}
+  labels: {{ $labels | nindent 4}}
+    component: besu
+    per-node: {{ $name }}-{{.}}
   name: {{ $name }}-{{ . }}
   namespace: {{ $.Release.Namespace}}
 spec:

diff --git a/charts/daml-on-postgres/Chart.yaml b/charts/daml-on-postgres/Chart.yaml
@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.1.5
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.

diff --git a/charts/daml-on-postgres/templates/daml-service.yaml b/charts/daml-on-postgres/templates/daml-service.yaml
@@ -2,8 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-{{include "daml.labels" . | indent 4 }}
+  labels: {{include "daml.labels" . | nindent 4 }}
+    component: daml
   name: {{ include "daml.fullname" . }}
   namespace: {{.Release.Namespace}}
 spec:

diff --git a/charts/daml-on-qldb/Chart.yaml b/charts/daml-on-qldb/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.0.9
+version: 0.0.10
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/charts/daml-on-qldb/templates/daml-service.yaml b/charts/daml-on-qldb/templates/daml-service.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: {{.Values.deployment.namespace}}
   labels:
     app: {{.Values.deployment.name}}
+    component: daml
 spec:
   ports:
   - port: 39000

diff --git a/charts/daml-on-sawtooth/Chart.yaml b/charts/daml-on-sawtooth/Chart.yaml
@@ -19,7 +19,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.1.60
+version: 0.1.61
 
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.

diff --git a/charts/daml-on-sawtooth/templates/daml-rpc-service.yaml b/charts/daml-on-sawtooth/templates/daml-rpc-service.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{.Values.sawtooth.networkName}}-daml-rpc
   labels:
     app: {{.Values.sawtooth.networkName}}-daml-rpc
+    component: daml
 spec:
   type: ClusterIP
   clusterIP: None

diff --git a/charts/daml-on-sawtooth/templates/validators-svcs.yaml b/charts/daml-on-sawtooth/templates/validators-svcs.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: {{.Values.sawtooth.namespace}}
   labels:
     app: {{.Values.sawtooth.networkName}}-validator
+    component: sawtooth
 spec:
   sessionAffinity: ClientIP
   ports:

diff --git a/charts/sawtooth/Chart.yaml b/charts/sawtooth/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: sawtooth
 description: BTP's Sawtooth distribution based on Hyperledger Sawtooth 1.2
 type: application
-version: 0.2.2
+version: 0.2.3
 appVersion: 1.2.5p4
 
 dependencies:

diff --git a/charts/sawtooth/templates/pernode-services.yaml b/charts/sawtooth/templates/pernode-services.yaml
@@ -9,6 +9,8 @@ apiVersion: v1
 kind: Service
 metadata:
   labels: {{ include "sawtooth.labels" $ctx | nindent 4}}
+    per-node: {{ include "common.names.fullname" $ctx }}-{{ . }}
+    component: sawtooth
   name: {{ include "common.names.fullname" $ctx }}-{{ . }}
   namespace: {{ $ctx.Release.Namespace }}
 spec:

diff --git a/charts/sawtooth/templates/validators-svcs.yaml b/charts/sawtooth/templates/validators-svcs.yaml
@@ -7,6 +7,7 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels: {{ include "sawtooth.labels" . | nindent 4}}
+    component: sawtooth
 spec:
   type: ClusterIP
   clusterIP: None

diff --git a/charts/sextant/Chart.yaml b/charts/sextant/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.1.11
+version: 2.1.12
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/charts/sextant/templates/service.yaml b/charts/sextant/templates/service.yaml
@@ -2,8 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "common.names.fullname" . }}
-  labels:
-{{ include "lib.labels" . | indent 4 }}
+  labels: {{ include "lib.labels" . | nindent 4 }}
+    component: sextant
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/charts/tfs-on-sawtooth/Chart.yaml b/charts/tfs-on-sawtooth/Chart.yaml
@@ -4,7 +4,7 @@ description: BTP's TFS distribution based on Hyperledger Sawtooth 1.1
 
 type: application
 
-version: 0.6.1
+version: 0.6.2
 
 appVersion: 1.3.0
 

diff --git a/charts/tfs-on-sawtooth/templates/pernode-services.yaml b/charts/tfs-on-sawtooth/templates/pernode-services.yaml
@@ -10,6 +10,8 @@ metadata:
   name: {{ include "common.names.fullname" $ctx }}-{{ . }}
   namespace: {{ $ctx.Release.Namespace }}
   labels: {{- include "lib.labels" $ctx | nindent 4 }}
+    per-node: {{ include "common.names.fullname" $ctx }}-{{ . }}
+    component: tfs
 spec:
   sessionAffinity: ClientIP
   type: {{ $ctx.Values.perNodeServiceType }}

diff --git a/charts/tfs-on-sawtooth/templates/service.yaml b/charts/tfs-on-sawtooth/templates/service.yaml
@@ -6,6 +6,7 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels: {{- include "lib.labels" . | nindent 4 }}
+    component: tfs
 spec:
   sessionAffinity: ClientIP
   ports: