diff --git a/charts/ozone/templates/datanode/datanode-statefulset.yaml b/charts/ozone/templates/datanode/datanode-statefulset.yaml index 66d42b6..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,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 diff --git a/charts/ozone/templates/om/om-statefulset.yaml b/charts/ozone/templates/om/om-statefulset.yaml index af89cbe..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,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 diff --git a/charts/ozone/templates/s3g/s3g-statefulset.yaml b/charts/ozone/templates/s3g/s3g-statefulset.yaml index a9a2086..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,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 diff --git a/charts/ozone/templates/scm/scm-statefulset.yaml b/charts/ozone/templates/scm/scm-statefulset.yaml index 9ce7af6..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,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 diff --git a/charts/ozone/values.yaml b/charts/ozone/values.yaml index 0cfc2bd..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: @@ -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 @@ -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 @@ -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 @@ -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