Skip to content

HDDS-13992. Support additional annotations for pods #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 3 commits into from
Nov 23, 2025
Merged

HDDS-13992. Support additional annotations for pods #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaa4d9e
HDDS-13992. Support additional annotations for pods
chehsunliu Nov 23, 2025
a89b91f
HDDS-13992. Fixed formatting
chehsunliu Nov 23, 2025
c648ec7
HDDS-13992. Add common pod annotations
chehsunliu Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charts/ozone/templates/datanode/datanode-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -40,6 +41,9 @@ spec:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }}
{{- with $podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "ozone.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: datanode
Expand Down
4 changes: 4 additions & 0 deletions charts/ozone/templates/om/om-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -40,6 +41,9 @@ spec:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }}
{{- with $podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "ozone.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: om
Expand Down
4 changes: 4 additions & 0 deletions charts/ozone/templates/s3g/s3g-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -40,6 +41,9 @@ spec:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }}
{{- with $podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "ozone.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: s3g
Expand Down
4 changes: 4 additions & 0 deletions charts/ozone/templates/scm/scm-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -40,6 +41,9 @@ spec:
metadata:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/ozone-configmap.yaml") . | sha256sum }}
{{- with $podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "ozone.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: scm
Expand Down
10 changes: 10 additions & 0 deletions charts/ozone/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ imagePullSecrets: []
env: []
# Common envFrom items to set up environment variables (templated)
envFrom: []
# Common annotations for pods
podAnnotations: {}

# Configuration management
configuration:
Expand Down Expand Up @@ -73,6 +75,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
Expand Down Expand Up @@ -116,6 +120,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
Expand Down Expand Up @@ -159,6 +165,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
Expand Down Expand Up @@ -209,6 +217,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
Expand Down