From eaa4d9e909d8e27721034c1534af6e927624a278 Mon Sep 17 00:00:00 2001 From: chehsunliu Date: Sun, 23 Nov 2025 18:14:22 +0800 Subject: [PATCH 1/3] HDDS-13992. Support additional annotations for pods --- charts/ozone/templates/datanode/datanode-statefulset.yaml | 3 +++ charts/ozone/templates/om/om-statefulset.yaml | 3 +++ charts/ozone/templates/s3g/s3g-statefulset.yaml | 3 +++ charts/ozone/templates/scm/scm-statefulset.yaml | 3 +++ charts/ozone/values.yaml | 8 ++++++++ 5 files changed, 20 insertions(+) diff --git a/charts/ozone/templates/datanode/datanode-statefulset.yaml b/charts/ozone/templates/datanode/datanode-statefulset.yaml index 66d42b6..29e95ad 100644 --- a/charts/ozone/templates/datanode/datanode-statefulset.yaml +++ b/charts/ozone/templates/datanode/datanode-statefulset.yaml @@ -40,6 +40,9 @@ spec: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} + {{- with .Values.datanode.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} labels: {{- include "ozone.selectorLabels" . | nindent 8 }} app.kubernetes.io/component: datanode diff --git a/charts/ozone/templates/om/om-statefulset.yaml b/charts/ozone/templates/om/om-statefulset.yaml index af89cbe..a5ad8b8 100644 --- a/charts/ozone/templates/om/om-statefulset.yaml +++ b/charts/ozone/templates/om/om-statefulset.yaml @@ -40,6 +40,9 @@ spec: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} + {{- with .Values.om.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} labels: {{- include "ozone.selectorLabels" . | nindent 8 }} app.kubernetes.io/component: om diff --git a/charts/ozone/templates/s3g/s3g-statefulset.yaml b/charts/ozone/templates/s3g/s3g-statefulset.yaml index a9a2086..fd05bde 100644 --- a/charts/ozone/templates/s3g/s3g-statefulset.yaml +++ b/charts/ozone/templates/s3g/s3g-statefulset.yaml @@ -40,6 +40,9 @@ spec: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} + {{- with .Values.s3g.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} labels: {{- include "ozone.selectorLabels" . | nindent 8 }} app.kubernetes.io/component: s3g diff --git a/charts/ozone/templates/scm/scm-statefulset.yaml b/charts/ozone/templates/scm/scm-statefulset.yaml index 9ce7af6..e39de7d 100644 --- a/charts/ozone/templates/scm/scm-statefulset.yaml +++ b/charts/ozone/templates/scm/scm-statefulset.yaml @@ -40,6 +40,9 @@ spec: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} + {{- with .Values.scm.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} labels: {{- include "ozone.selectorLabels" . | nindent 8 }} app.kubernetes.io/component: scm diff --git a/charts/ozone/values.yaml b/charts/ozone/values.yaml index 0cfc2bd..72d966c 100644 --- a/charts/ozone/values.yaml +++ b/charts/ozone/values.yaml @@ -73,6 +73,8 @@ datanode: envFrom: [] # Datanode resource requests and limits resources: {} + # Extra annotations for Datanode pods + podAnnotations: {} # Constrain Datanode pods to nodes with specific node labels nodeSelector: {} # Constrain Datanode pods to nodes by affinity/anti-affinity rules @@ -116,6 +118,8 @@ om: envFrom: [] # Ozone Manager resource requests and limits resources: {} + # Extra annotations for Ozone Manager pods + podAnnotations: {} # Constrain Ozone Manager pods to nodes with specific node labels nodeSelector: {} # Constrain Ozone Manager pods to nodes by affinity/anti-affinity rules @@ -159,6 +163,8 @@ s3g: envFrom: [] # S3 Gateway resource requests and limits resources: {} + # Extra annotations for S3 Gateway pods + podAnnotations: {} # Constrain S3 Gateway pods to nodes with specific node labels nodeSelector: {} # Constrain S3 Gateway pods to nodes by affinity/anti-affinity rules @@ -209,6 +215,8 @@ scm: envFrom: [] # Storage Container Manager resource requests and limits resources: {} + # Extra annotations for Storage Container Manager pods + podAnnotations: {} # Constrain Storage Container Manager pods to nodes with specific node labels nodeSelector: {} # Constrain Storage Container Manager pods to nodes by affinity/anti-affinity rules From a89b91fe283ab4bdefdbff68e6dbab54bbdf6604 Mon Sep 17 00:00:00 2001 From: chehsunliu Date: Sun, 23 Nov 2025 21:07:37 +0800 Subject: [PATCH 2/3] HDDS-13992. Fixed formatting --- charts/ozone/templates/datanode/datanode-statefulset.yaml | 2 +- charts/ozone/templates/om/om-statefulset.yaml | 2 +- charts/ozone/templates/s3g/s3g-statefulset.yaml | 2 +- charts/ozone/templates/scm/scm-statefulset.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/ozone/templates/datanode/datanode-statefulset.yaml b/charts/ozone/templates/datanode/datanode-statefulset.yaml index 29e95ad..c18709c 100644 --- a/charts/ozone/templates/datanode/datanode-statefulset.yaml +++ b/charts/ozone/templates/datanode/datanode-statefulset.yaml @@ -41,7 +41,7 @@ spec: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} {{- with .Values.datanode.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} labels: {{- include "ozone.selectorLabels" . | nindent 8 }} diff --git a/charts/ozone/templates/om/om-statefulset.yaml b/charts/ozone/templates/om/om-statefulset.yaml index a5ad8b8..d8e9276 100644 --- a/charts/ozone/templates/om/om-statefulset.yaml +++ b/charts/ozone/templates/om/om-statefulset.yaml @@ -41,7 +41,7 @@ spec: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} {{- with .Values.om.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} labels: {{- include "ozone.selectorLabels" . | nindent 8 }} diff --git a/charts/ozone/templates/s3g/s3g-statefulset.yaml b/charts/ozone/templates/s3g/s3g-statefulset.yaml index fd05bde..194c5e0 100644 --- a/charts/ozone/templates/s3g/s3g-statefulset.yaml +++ b/charts/ozone/templates/s3g/s3g-statefulset.yaml @@ -41,7 +41,7 @@ spec: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} {{- with .Values.s3g.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} labels: {{- include "ozone.selectorLabels" . | nindent 8 }} diff --git a/charts/ozone/templates/scm/scm-statefulset.yaml b/charts/ozone/templates/scm/scm-statefulset.yaml index e39de7d..aa72cc0 100644 --- a/charts/ozone/templates/scm/scm-statefulset.yaml +++ b/charts/ozone/templates/scm/scm-statefulset.yaml @@ -41,7 +41,7 @@ spec: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} {{- with .Values.scm.podAnnotations }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end }} labels: {{- include "ozone.selectorLabels" . | nindent 8 }} From c648ec721191376fb06db6fb2dd03508dab39293 Mon Sep 17 00:00:00 2001 From: chehsunliu Date: Sun, 23 Nov 2025 21:33:58 +0800 Subject: [PATCH 3/3] HDDS-13992. Add common pod annotations --- charts/ozone/templates/datanode/datanode-statefulset.yaml | 3 ++- charts/ozone/templates/om/om-statefulset.yaml | 3 ++- charts/ozone/templates/s3g/s3g-statefulset.yaml | 3 ++- charts/ozone/templates/scm/scm-statefulset.yaml | 3 ++- charts/ozone/values.yaml | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/charts/ozone/templates/datanode/datanode-statefulset.yaml b/charts/ozone/templates/datanode/datanode-statefulset.yaml index c18709c..e47a8d4 100644 --- a/charts/ozone/templates/datanode/datanode-statefulset.yaml +++ b/charts/ozone/templates/datanode/datanode-statefulset.yaml @@ -18,6 +18,7 @@ {{- $env := concat .Values.env .Values.datanode.env }} {{- $envFrom := concat .Values.envFrom .Values.datanode.envFrom }} +{{- $podAnnotations := mergeOverwrite (deepCopy .Values.podAnnotations) .Values.datanode.podAnnotations }} {{- $nodeSelector := or .Values.datanode.nodeSelector .Values.nodeSelector }} {{- $affinity := or .Values.datanode.affinity .Values.affinity }} {{- $tolerations := or .Values.datanode.tolerations .Values.tolerations }} @@ -40,7 +41,7 @@ spec: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} - {{- with .Values.datanode.podAnnotations }} + {{- with $podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: diff --git a/charts/ozone/templates/om/om-statefulset.yaml b/charts/ozone/templates/om/om-statefulset.yaml index d8e9276..379cec8 100644 --- a/charts/ozone/templates/om/om-statefulset.yaml +++ b/charts/ozone/templates/om/om-statefulset.yaml @@ -18,6 +18,7 @@ {{- $env := concat .Values.env .Values.om.env }} {{- $envFrom := concat .Values.envFrom .Values.om.envFrom }} +{{- $podAnnotations := mergeOverwrite (deepCopy .Values.podAnnotations) .Values.om.podAnnotations }} {{- $nodeSelector := or .Values.om.nodeSelector .Values.nodeSelector }} {{- $affinity := or .Values.om.affinity .Values.affinity }} {{- $tolerations := or .Values.om.tolerations .Values.tolerations }} @@ -40,7 +41,7 @@ spec: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} - {{- with .Values.om.podAnnotations }} + {{- with $podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: diff --git a/charts/ozone/templates/s3g/s3g-statefulset.yaml b/charts/ozone/templates/s3g/s3g-statefulset.yaml index 194c5e0..4a11f07 100644 --- a/charts/ozone/templates/s3g/s3g-statefulset.yaml +++ b/charts/ozone/templates/s3g/s3g-statefulset.yaml @@ -18,6 +18,7 @@ {{- $env := concat .Values.env .Values.s3g.env }} {{- $envFrom := concat .Values.envFrom .Values.s3g.envFrom }} +{{- $podAnnotations := mergeOverwrite (deepCopy .Values.podAnnotations) .Values.s3g.podAnnotations }} {{- $nodeSelector := or .Values.s3g.nodeSelector .Values.nodeSelector }} {{- $affinity := or .Values.s3g.affinity .Values.affinity }} {{- $tolerations := or .Values.s3g.tolerations .Values.tolerations }} @@ -40,7 +41,7 @@ spec: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} - {{- with .Values.s3g.podAnnotations }} + {{- with $podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: diff --git a/charts/ozone/templates/scm/scm-statefulset.yaml b/charts/ozone/templates/scm/scm-statefulset.yaml index aa72cc0..27cf1f3 100644 --- a/charts/ozone/templates/scm/scm-statefulset.yaml +++ b/charts/ozone/templates/scm/scm-statefulset.yaml @@ -18,6 +18,7 @@ {{- $env := concat .Values.env .Values.scm.env }} {{- $envFrom := concat .Values.envFrom .Values.scm.envFrom }} +{{- $podAnnotations := mergeOverwrite (deepCopy .Values.podAnnotations) .Values.scm.podAnnotations }} {{- $nodeSelector := or .Values.scm.nodeSelector .Values.nodeSelector }} {{- $affinity := or .Values.scm.affinity .Values.affinity }} {{- $tolerations := or .Values.scm.tolerations .Values.tolerations }} @@ -40,7 +41,7 @@ spec: metadata: annotations: checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }} - {{- with .Values.scm.podAnnotations }} + {{- with $podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: diff --git a/charts/ozone/values.yaml b/charts/ozone/values.yaml index 72d966c..8defa29 100644 --- a/charts/ozone/values.yaml +++ b/charts/ozone/values.yaml @@ -25,6 +25,8 @@ imagePullSecrets: [] env: [] # Common envFrom items to set up environment variables (templated) envFrom: [] +# Common annotations for pods +podAnnotations: {} # Configuration management configuration: