Apply review of @jscheffi - Add deploymentOverride in dagBundleConfigList

Author: uplsh580

chart/templates/dag-processor/dag-processor-deployment.yaml

@@ -38,14 +38,12 @@ Expects context with:
 {{- $containerSecurityContextLogGroomerSidecar := include "containerSecurityContext" (list $mergedConfig.logGroomerSidecar .Values) }}
 {{- $containerSecurityContextWaitForMigrations := include "containerSecurityContext" (list $mergedConfig.waitForMigrations .Values) }}
 {{- $containerLifecycleHooks := or $mergedConfig.containerLifecycleHooks .Values.containerLifecycleHooks }}
-{{- /* Prepare args: use per-bundle args if enabled, otherwise use default args */}}
+{{- /* Prepare args: append --bundle-name to the base args for per-bundle deployments */}}
 {{- $args := $mergedConfig.args }}
-{{- if and $deployPerBundle .Values.dagProcessor.deployPerBundle.args }}
-  {{- $args = list }}
-  {{- range .Values.dagProcessor.deployPerBundle.args }}
-    {{- $arg := . | toString | replace "{{ bundleName }}" $bundleName }}
-    {{- $args = append $args $arg }}
-  {{- end }}
+{{- if $deployPerBundle }}
+  {{- $lastIdx := sub (len $args) 1 }}
+  {{- $lastArg := printf "%s --bundle-name %s" (index $args (int $lastIdx)) $bundleName }}
+  {{- $args = mustInitial $args | append $lastArg }}
 {{- end }}
 {{- /* Determine deployment name suffix */}}
 {{- $nameSuffix := "" }}
@@ -323,7 +321,7 @@ spec:
 {{- if eq $enabled nil}}
   {{ $enabled = ternary true false (semverCompare ">=3.0.0" .Values.airflowVersion) }}
 {{- end }}
-{{- $deployPerBundle := .Values.dagProcessor.deployPerBundle.enabled | default false }}
+{{- $deployPerBundle := .Values.dagProcessor.deployPerBundle | default false }}
 {{- if $enabled }}
   {{- if not $deployPerBundle }}
     {{- /* Single deployment mode: use base dagProcessor config */}}
@@ -334,7 +332,7 @@ spec:
     {{- $firstBundle := true }}
     {{- range $bundle := .Values.dagProcessor.dagBundleConfigList }}
       {{- $bundleName := $bundle.name }}
-      {{- $bundleOverrides := index $.Values.dagProcessor.deployPerBundle.bundleOverrides $bundleName | default dict | deepCopy }}
+      {{- $bundleOverrides := $bundle.deploymentOverride | default dict | deepCopy }}
       {{- $baseConfig := $.Values.dagProcessor | deepCopy }}
       {{- $mergedConfig := mergeOverwrite $baseConfig $bundleOverrides }}
       {{- $_ := set $mergedConfig "dagBundleConfigList" $.Values.dagProcessor.dagBundleConfigList }}

chart/templates/dag-processor/dag-processor-poddisruptionbudget.yaml

@@ -23,6 +23,7 @@ Expects context with:
   - .Values.dagProcessor: dag processor configuration (may be merged with bundle overrides)
   - .bundleName: bundle name (empty string if not per-bundle mode)
   - .deployPerBundle: boolean indicating if per-bundle mode is enabled
+  - .bundleOverrides: raw bundle deploymentOverride dict (for PDB config resolution)
 */}}
 {{- define "dag-processor.poddisruptionbudget" }}
 {{- $bundleName := .bundleName | default "" }}
@@ -82,7 +83,7 @@ spec:
 {{- if eq $enabled nil}}
   {{ $enabled = ternary true false (semverCompare ">=3.0.0" .Values.airflowVersion) }}
 {{- end }}
-{{- $deployPerBundle := .Values.dagProcessor.deployPerBundle.enabled | default false }}
+{{- $deployPerBundle := .Values.dagProcessor.deployPerBundle | default false }}
 {{- if and $enabled .Values.dagProcessor.podDisruptionBudget.enabled }}
   {{- if not $deployPerBundle }}
     {{- /* Single PDB mode: use base dagProcessor config */}}
@@ -93,7 +94,7 @@ spec:
     {{- $firstPDB := true }}
     {{- range $bundle := .Values.dagProcessor.dagBundleConfigList }}
       {{- $bundleName := $bundle.name }}
-      {{- $bundleOverrides := index $.Values.dagProcessor.deployPerBundle.bundleOverrides $bundleName | default dict | deepCopy }}
+      {{- $bundleOverrides := $bundle.deploymentOverride | default dict | deepCopy }}
       {{- $baseConfig := $.Values.dagProcessor | deepCopy }}
       {{- $mergedConfig := mergeOverwrite $baseConfig $bundleOverrides }}
       {{- $_ := set $mergedConfig "dagBundleConfigList" $.Values.dagProcessor.dagBundleConfigList }}

chart/values.schema.json

@@ -4475,7 +4475,6 @@
                     ],
                     "items": {
                         "type": "object",
-                        "additionalProperties": false,
                         "required": [
                             "name",
                             "classpath"
@@ -4501,51 +4500,19 @@
                                         "null"
                                     ]
                                 }
+                            },
+                            "deploymentOverride": {
+                                "description": "Per-bundle deployment overrides. Only used when deployPerBundle is true. Overrides base dagProcessor settings for this bundle.",
+                                "type": "object",
+                                "additionalProperties": {}
                             }
                         }
                     }
                 },
                 "deployPerBundle": {
-                    "description": "Per-bundle deployment option. When enabled, creates a separate deployment for each bundle in `dagBundleConfigList`.",
-                    "type": "object",
-                    "additionalProperties": false,
-                    "properties": {
-                        "enabled": {
-                            "description": "Enable per-bundle deployments. When true, creates a separate deployment for each bundle.",
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "args": {
-                            "description": "Command args template for per-bundle deployments. `{{ bundleName }}` will be replaced with the actual bundle name.",
-                            "type": "array",
-                            "default": [
-                                "bash",
-                                "-c",
-                                "exec airflow dag-processor --bundle-name {{ bundleName }}"
-                            ],
-                            "items": {
-                                "type": "string"
-                            }
-                        },
-                        "bundleOverrides": {
-                            "description": "Per-bundle specific overrides. Each key should match a bundle name from `dagBundleConfigList`.",
-                            "type": "object",
-                            "additionalProperties": {
-                                "type": "object",
-                                "additionalProperties": {}
-                            },
-                            "default": {}
-                        }
-                    },
-                    "default": {
-                        "enabled": false,
-                        "args": [
-                            "bash",
-                            "-c",
-                            "exec airflow dag-processor --bundle-name {{ bundleName }}"
-                        ],
-                        "bundleOverrides": {}
-                    }
+                    "description": "When true, creates a separate deployment for each bundle in dagBundleConfigList.",
+                    "type": "boolean",
+                    "default": false
                 },
                 "livenessProbe": {
                     "description": "Liveness probe configuration for dag processor.",

chart/values.yaml

@@ -2298,6 +2298,25 @@ dagProcessor:
   #       subdir: "dags"
   #       tracking_ref: "main"
   #       refresh_interval: 60
+  #     # Per-bundle deployment overrides (only used when deployPerBundle is true)
+  #     deploymentOverride:
+  #       replicas: 3
+  #       resources:
+  #         requests:
+  #           memory: "2Gi"
+  #           cpu: "1000m"
+  #         limits:
+  #           memory: "4Gi"
+  #           cpu: "2000m"
+  #       nodeSelector:
+  #         workload-type: production
+  #       env:
+  #       - name: SOME_ENV_VAR
+  #         value: "20"
+  #       podDisruptionBudget:
+  #         enabled: true
+  #         config:
+  #           minAvailable: 1
   #   - name: bundle2
   #     classpath: "airflow.providers.git.bundles.git.GitDagBundle"
   #     kwargs:
@@ -2310,37 +2329,9 @@ dagProcessor:
   #     kwargs: {}
 
   # Per-bundle deployment option
-  # When enabled, creates a separate deployment for each bundle in `dagBundleConfigList`
-  deployPerBundle:
-    enabled: false
-    # Command args template for per-bundle deployments
-    # `{{ bundleName }}` will be replaced with the actual bundle name
-    args: ["bash", "-c", "exec airflow dag-processor --bundle-name {{ bundleName }}"]
-
-    # Per-bundle specific overrides (optional)
-    # Each key should match a bundle name from `dagBundleConfigList`
-    # These settings override the base dagProcessor configuration for each bundle
-    bundleOverrides: {}
-    # Example: Override settings for a specific bundle
-    # bundleOverrides:
-    #   bundle1:
-    #     replicas: 3
-    #     resources:
-    #       requests:
-    #         memory: "2Gi"
-    #         cpu: "1000m"
-    #       limits:
-    #         memory: "4Gi"
-    #         cpu: "2000m"
-    #     nodeSelector:
-    #       workload-type: production
-    #     env:
-    #     - name: SOME_ENV_VAR
-    #       value: "20"
-    #     podDisruptionBudget:
-    #       enabled: true
-    #       config:
-    #         minAvailable: 1
+  # When enabled, creates a separate deployment for each bundle in `dagBundleConfigList`.
+  # Bundle-specific deployment overrides can be set via `deploymentOverride` in each bundle entry.
+  deployPerBundle: false
 
   # Number of airflow dag processors in the deployment
   replicas: 1