HDDS-11841. Add support for additional service labels and annotations (…

…#13)
apache · Dec 4, 2024 · 1619b1a · 1619b1a
1 parent 5b5e67b
commit 1619b1a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 0 deletions.
diff --git a/charts/ozone/templates/datanode/datanode-service.yaml b/charts/ozone/templates/datanode/datanode-service.yaml
@@ -23,6 +23,12 @@ metadata:
   labels:
     {{- include "ozone.labels" . | nindent 4 }}
     app.kubernetes.io/component: datanode
+    {{- with .Values.datanode.service.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.datanode.service.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.datanode.service.type }}
   ports:

diff --git a/charts/ozone/templates/om/om-service.yaml b/charts/ozone/templates/om/om-service.yaml
@@ -23,6 +23,12 @@ metadata:
   labels:
     {{- include "ozone.labels" . | nindent 4 }}
     app.kubernetes.io/component: om
+    {{- with .Values.om.service.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.om.service.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.om.service.type }}
   ports:

diff --git a/charts/ozone/templates/s3g/s3g-service.yaml b/charts/ozone/templates/s3g/s3g-service.yaml
@@ -23,6 +23,12 @@ metadata:
   labels:
     {{- include "ozone.labels" . | nindent 4 }}
     app.kubernetes.io/component: s3g
+    {{- with .Values.s3g.service.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.s3g.service.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.s3g.service.type }}
   ports:

diff --git a/charts/ozone/templates/scm/scm-service.yaml b/charts/ozone/templates/scm/scm-service.yaml
@@ -23,6 +23,12 @@ metadata:
   labels:
     {{- include "ozone.labels" . | nindent 4 }}
     app.kubernetes.io/component: scm
+    {{- with .Values.scm.service.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.scm.service.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.scm.service.type }}
   ports:

diff --git a/charts/ozone/values.yaml b/charts/ozone/values.yaml
@@ -84,6 +84,8 @@ datanode:
     type: ClusterIP
     port: 9882
     nodePort: ~
+    labels: {}
+    annotations: {}
   # Datanode persistence
   persistence:
     # Enable persistence
@@ -123,6 +125,8 @@ om:
     type: ClusterIP
     port: 9874
     nodePort: ~
+    labels: {}
+    annotations: {}
   # Ozone Manager persistence
   persistence:
     # Enable persistence
@@ -162,6 +166,8 @@ s3g:
     type: ClusterIP
     port: 9878
     nodePort: ~
+    labels: {}
+    annotations: {}
   # S3 Gateway persistence
   persistence:
     # Enable persistence
@@ -201,6 +207,8 @@ scm:
     type: ClusterIP
     port: 9876
     nodePort: ~
+    labels: {}
+    annotations: {}
   # Storage Container Manager persistence
   persistence:
     # Enable persistence