This is an automated email from the ASF dual-hosted git repository.

Tejaskriya pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ozone-helm-charts.git


The following commit(s) were added to refs/heads/main by this push:
     new 49105f2  HDDS-15993. Unused values in ozone helm chart values.yaml 
(#53)
49105f2 is described below

commit 49105f2e5b20c2a9db77c6ee618f3ae1087bfb13
Author: Mark Tsai <[email protected]>
AuthorDate: Tue Sep 15 16:57:26 2026 +0800

    HDDS-15993. Unused values in ozone helm chart values.yaml (#53)
---
 charts/ozone/templates/helm/om-decommission-job.yaml |  6 ++++++
 .../ozone/templates/helm/om-leader-transfer-job.yaml |  6 ++++++
 .../ozone/templates/om/om-bootstrap-configmap.yaml   |  3 ++-
 charts/ozone/values.yaml                             | 20 +++-----------------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/charts/ozone/templates/helm/om-decommission-job.yaml 
b/charts/ozone/templates/helm/om-decommission-job.yaml
index b47c46c..5f9be3e 100644
--- a/charts/ozone/templates/helm/om-decommission-job.yaml
+++ b/charts/ozone/templates/helm/om-decommission-job.yaml
@@ -27,6 +27,9 @@ spec:
       labels:
         {{- include "ozone.selectorLabels" $ | nindent 8 }}
         app.kubernetes.io/component: helm-manager
+      {{- with $.Values.helm.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       {{- with $.Values.imagePullSecrets }}
       imagePullSecrets: {{- toYaml . | nindent 8 }}
@@ -38,6 +41,9 @@ spec:
           {{- with $.Values.om.command }}
           command: {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
+          {{- with $.Values.helm.resources }}
+          resources: {{- toYaml . | nindent 12 }}
+          {{- end }}
           args:
             - sh
             - -c
diff --git a/charts/ozone/templates/helm/om-leader-transfer-job.yaml 
b/charts/ozone/templates/helm/om-leader-transfer-job.yaml
index 553079f..e81c8a8 100644
--- a/charts/ozone/templates/helm/om-leader-transfer-job.yaml
+++ b/charts/ozone/templates/helm/om-leader-transfer-job.yaml
@@ -26,6 +26,9 @@ spec:
       labels:
         {{- include "ozone.selectorLabels" $ | nindent 8 }}
         app.kubernetes.io/component: helm-manager
+      {{- with $.Values.helm.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       {{- with $.Values.imagePullSecrets }}
       imagePullSecrets: {{- toYaml . | nindent 8 }}
@@ -37,6 +40,9 @@ spec:
           {{- with $.Values.om.command }}
           command: {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
+          {{- with $.Values.helm.resources }}
+          resources: {{- toYaml . | nindent 12 }}
+          {{- end }}
           args:
             - sh
             - -c
diff --git a/charts/ozone/templates/om/om-bootstrap-configmap.yaml 
b/charts/ozone/templates/om/om-bootstrap-configmap.yaml
index 141e19e..d775f68 100644
--- a/charts/ozone/templates/om/om-bootstrap-configmap.yaml
+++ b/charts/ozone/templates/om/om-bootstrap-configmap.yaml
@@ -11,7 +11,8 @@ data:
     #!/bin/sh
     set -e
 
-    HELM_MANAGER_PATH="{{ .Values.om.persistence.path }}{{ 
.Values.helm.persistence.path }}"
+    # "/data" is a fixed marker-subdirectory name, not user-configurable.
+    HELM_MANAGER_PATH="{{ .Values.om.persistence.path }}/data"
     HELM_MANAGER_BOOTSTRAPPED_FILE="$HELM_MANAGER_PATH/bootstrapped"
 
     # These are templated from Helm
diff --git a/charts/ozone/values.yaml b/charts/ozone/values.yaml
index bcef322..7d53b96 100644
--- a/charts/ozone/values.yaml
+++ b/charts/ozone/values.yaml
@@ -298,11 +298,11 @@ helm:
   env: []
   # Additional Helm Manager envFrom items to set up environment variables 
(templated)
   envFrom: []
-  # Storage Container Manager resource requests and limits
+  # Helm Manager Job resource requests and limits
   resources: {}
-  # Extra annotations for Storage Container Manager pods
+  # Extra annotations for Helm Manager Job pods
   podAnnotations: {}
-  # Constrain Storage Container Manager pods to nodes with specific node labels
+  # Constrain Helm Manager pods to nodes with specific node labels
   nodeSelector: {}
   # Constrain Helm Manager pods to nodes by affinity/anti-affinity rules
   affinity: {}
@@ -315,20 +315,6 @@ helm:
   # This can happen if PVC has been deleted or is not reachable.
   # This is used for decommissioning OM
   backoffLimit: 5
-  # Helm Manager persistence (this is enabled automatically if al least one
-  # of datanode, scm or om is enabled)
-  persistence:
-    # Enable persistence
-    enabled: false
-    # Persistence access modes
-    accessModes:
-      - ReadWriteOnce
-    # Path for Storage Container Manager volume mount
-    path: /data
-    # Volume size
-    size: 10Gi
-    # The name of a specific storage class name to use
-    storageClassName: ~
 
 # Recon configuration
 recon:


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to