Add support for multiple overrides

entrypoint

@@ -38,7 +38,12 @@ for arg in "$@"; do
       SERVICE_PATH="${arg#*=}"
       ;;
     --overrides-path=*)
-      OVERRIDES_PATH="${arg#*=}"
+      OVERRIDE_VALUE="${arg#*=}"
+      IFS=',' read -ra SPLIT_PATHS <<< "$OVERRIDE_VALUE"
+      for path in "${SPLIT_PATHS[@]}"; do
+        path=$(echo "$path" | xargs)
+        OVERRIDES_PATHS+=("$path")
+      done
       ;;
     *)
       echo "Unknown argument: $arg"
@@ -47,7 +52,10 @@ for arg in "$@"; do
   esac
 done
 
-OVERRIDES_PATH="${OVERRIDES_PATH:-$SERVICE_PATH/overrides}"
+if [[ ${#OVERRIDES_PATHS[@]} -gt 0 ]]; then
+  OVERRIDES_PATH=$(IFS=','; echo "${OVERRIDES_PATHS[*]}")
+fi
+
 
 export SERVICE_PATH
 export OVERRIDES_PATH

k8s/deployment/build_context

@@ -54,6 +54,16 @@ TRAFFIC_CONTAINER_IMAGE=${TRAFFIC_CONTAINER_IMAGE:-"public.ecr.aws/nullplatform/
 PDB_ENABLED=${POD_DISRUPTION_BUDGET_ENABLED:-"false"}
 PDB_MAX_UNAVAILABLE=${POD_DISRUPTION_BUDGET_MAX_UNAVAILABLE:-"25%"}
 
+IAM=${IAM-"{}"}
+
+IAM_ENABLED=$(echo "$IAM" | jq -r .ENABLED)
+
+SERVICE_ACCOUNT_NAME=""
+
+if [[ "$IAM_ENABLED" == "true" ]]; then
+  SERVICE_ACCOUNT_NAME=$(echo "$IAM" | jq -r .PREFIX)-"$SCOPE_ID"
+fi
+
 CONTEXT=$(echo "$CONTEXT" | jq \
           --arg blue_deployment_id "$BLUE_DEPLOYMENT_ID" \
           --arg blue_replicas "$BLUE_REPLICAS" \
@@ -63,14 +73,16 @@ CONTEXT=$(echo "$CONTEXT" | jq \
           --argjson pull_secrets "$IMAGE_PULL_SECRETS" \
           --arg pdb_enabled "$PDB_ENABLED" \
           --arg pdb_max_unavailable "$PDB_MAX_UNAVAILABLE" \
+          --arg service_account_name "$SERVICE_ACCOUNT_NAME" \
           '. + {blue_deployment_id: $blue_deployment_id,
                 blue_replicas: $blue_replicas,
                 green_replicas: $green_replicas,
                 total_replicas: $total_replicas,
                 pull_secrets: $pull_secrets,
                 traffic_image: $traffic_image,
                 pdb_enabled: $pdb_enabled,
-                pdb_max_unavailable: $pdb_max_unavailable
+                pdb_max_unavailable: $pdb_max_unavailable,
+                service_account_name: $service_account_name
           }')
 
 DEPLOYMENT_ID=$(echo "$CONTEXT" | jq -r '.deployment.id')

k8s/deployment/build_deployment

@@ -1,23 +1,13 @@
 #!/bin/bash
 
-IAM=${IAM-"{}"}
-
-IAM_ENABLED=$(echo "$IAM" | jq -r .ENABLED)
-
-SERVICE_ACCOUNT_NAME=""
-
-if [[ "$IAM_ENABLED" == "true" ]]; then
-  SERVICE_ACCOUNT_NAME=$(echo "$IAM" | jq -r .PREFIX)-"$SCOPE_ID"
-fi
-
 DEPLOYMENT_PATH="$OUTPUT_DIR/deployment-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 SECRET_PATH="$OUTPUT_DIR/secret-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 SCALING_PATH="$OUTPUT_DIR/scaling-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 SERVICE_TEMPLATE_PATH="$OUTPUT_DIR/service-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 PDB_PATH="$OUTPUT_DIR/pdb-$SCOPE_ID-$DEPLOYMENT_ID.yaml"
 CONTEXT_PATH="$OUTPUT_DIR/context-$SCOPE_ID.json"
 
-echo "$CONTEXT" | jq --arg replicas "$REPLICAS" --arg service_account_name "$SERVICE_ACCOUNT_NAME" '. + {replicas: $replicas, service_account_name: $service_account_name}' > "$CONTEXT_PATH"
+echo "$CONTEXT" | jq --arg replicas "$REPLICAS" '. + {replicas: $replicas}' > "$CONTEXT_PATH"
 
 echo "Building Template: $DEPLOYMENT_TEMPLATE to $DEPLOYMENT_PATH"
 

scheduled_task/deployment/templates/deployment.yaml.tpl

@@ -131,6 +131,9 @@ spec:
             - name: {{ $secret }}
             {{- end }}
           {{- end }}
+          {{- if .service_account_name }}
+          serviceAccountName: {{ .service_account_name }}
+          {{- end }}
           containers:
             - name: application
               envFrom:

service/deployment/entrypoint

@@ -33,13 +33,18 @@ case "$SERVICE_ACTION" in
 esac
 
 WORKFLOW_PATH="$SERVICE_PATH/deployment/workflows/$ACTION_TO_EXECUTE.yaml"
-OVERRIDES_WORKFLOW_PATH="$OVERRIDES_PATH/deployment/workflows/$ACTION_TO_EXECUTE.yaml"
 
 CMD="np service workflow exec --workflow $WORKFLOW_PATH --build-context --include-secrets"
 
-if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then
-  CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH"
-fi
+IFS=',' read -ra OVERRIDE_PATHS <<< "$OVERRIDES_PATH"
+for path in "${OVERRIDE_PATHS[@]}"; do
+  # Trim whitespace
+  path=$(echo "$path" | xargs)
+  OVERRIDE_WORKFLOW_PATH="$path/deployment/workflows/$ACTION_TO_EXECUTE.yaml"
+  if [[ -f "$OVERRIDE_WORKFLOW_PATH" ]]; then
+    CMD="$CMD --overrides $OVERRIDE_WORKFLOW_PATH"
+  fi
+done
 
 echo "Executing command: $CMD"
 eval $CMD

service/instance/entrypoint

@@ -15,12 +15,17 @@ else
 fi
 
 WORKFLOW_PATH="$SERVICE_PATH/instance/workflows/list.yaml"
-OVERRIDES_WORKFLOW_PATH="$OVERRIDES_WORKFLOW_PATH/instance/workflows/list.yaml"
 
 CMD="np service workflow exec --no-output --workflow $WORKFLOW_PATH"
 
-if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then
-  CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH"
-fi
+IFS=',' read -ra OVERRIDE_PATHS <<< "$OVERRIDES_PATH"
+for path in "${OVERRIDE_PATHS[@]}"; do
+  # Trim whitespace
+  path=$(echo "$path" | xargs)
+  OVERRIDE_WORKFLOW_PATH="$path/instance/workflows/$ACTION_TO_EXECUTE.yaml"
+  if [[ -f "$OVERRIDE_WORKFLOW_PATH" ]]; then
+    CMD="$CMD --overrides $OVERRIDE_WORKFLOW_PATH"
+  fi
+done
 
 eval "$CMD"

service/log/entrypoint

@@ -1,12 +1,17 @@
 #!/bin/bash
 
 WORKFLOW_PATH="$SERVICE_PATH/log/workflows/log.yaml"
-OVERRIDES_WORKFLOW_PATH="$OVERRIDES_PATH/log/workflows/log.yaml"
 
 CMD="np service workflow exec --no-output --workflow $WORKFLOW_PATH"
 
-if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then
-  CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH"
-fi
+IFS=',' read -ra OVERRIDE_PATHS <<< "$OVERRIDES_PATH"
+for path in "${OVERRIDE_PATHS[@]}"; do
+  # Trim whitespace
+  path=$(echo "$path" | xargs)
+  OVERRIDE_WORKFLOW_PATH="$path/log/workflows/$ACTION_TO_EXECUTE.yaml"
+  if [[ -f "$OVERRIDE_WORKFLOW_PATH" ]]; then
+    CMD="$CMD --overrides $OVERRIDE_WORKFLOW_PATH"
+  fi
+done
 
 eval "$CMD"

service/metric/entrypoint

@@ -1,17 +1,24 @@
 #!/bin/bash
 
-WORKFLOW_PATH="$SERVICE_PATH/metric/workflows/metric.yaml"
-OVERRIDES_WORKFLOW_PATH="$OVERRIDES_PATH/metric/workflows/metric.yaml"
+ACTION_TO_EXECUTE="metric"
+
 
 if [[ "$NOTIFICATION_ACTION" == "metric:list" ]]; then
-  WORKFLOW_PATH="$SERVICE_PATH/metric/workflows/list.yaml"
-  OVERRIDES_WORKFLOW_PATH="$OVERRIDES_PATH/metric/workflows/list.yaml"
+  ACTION_TO_EXECUTE="list"
 fi
 
+WORKFLOW_PATH="$SERVICE_PATH/metric/workflows/$ACTION_TO_EXECUTE.yaml"
+
 CMD="np service workflow exec --no-output --workflow $WORKFLOW_PATH"
 
-if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then
-  CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH"
-fi
+IFS=',' read -ra OVERRIDE_PATHS <<< "$OVERRIDES_PATH"
+for path in "${OVERRIDE_PATHS[@]}"; do
+  # Trim whitespace
+  path=$(echo "$path" | xargs)
+  OVERRIDE_WORKFLOW_PATH="$path/metric/workflows/$ACTION_TO_EXECUTE.yaml"
+  if [[ -f "$OVERRIDE_WORKFLOW_PATH" ]]; then
+    CMD="$CMD --overrides $OVERRIDE_WORKFLOW_PATH"
+  fi
+done
 
 eval $CMD

service/parameter/entrypoint

@@ -5,12 +5,17 @@ IFS=':' read -ra ACTION_PARTS <<< "$NOTIFICATION_ACTION"
 ACTION_TO_EXECUTE="${ACTION_PARTS[1]}"
 
 WORKFLOW_PATH="$SERVICE_PATH/parameters/workflows/$ACTION_TO_EXECUTE.yaml"
-OVERRIDES_WORKFLOW_PATH="$OVERRIDES_PATH/parameters/workflows/$ACTION_TO_EXECUTE.yaml"
 
 CMD="np service workflow exec --no-output --workflow $WORKFLOW_PATH"
 
-if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then
-  CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH"
-fi
+IFS=',' read -ra OVERRIDE_PATHS <<< "$OVERRIDES_PATH"
+for path in "${OVERRIDE_PATHS[@]}"; do
+  # Trim whitespace
+  path=$(echo "$path" | xargs)
+  OVERRIDE_WORKFLOW_PATH="$path/parameters/workflows/$ACTION_TO_EXECUTE.yaml"
+  if [[ -f "$OVERRIDE_WORKFLOW_PATH" ]]; then
+    CMD="$CMD --overrides $OVERRIDE_WORKFLOW_PATH"
+  fi
+done
 
 eval $CMD

service/scope/entrypoint

@@ -24,9 +24,15 @@ fi
 
 CMD="np service workflow exec --workflow $WORKFLOW_PATH --build-context --include-secrets"
 
-if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then
-  CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH"
-fi
+IFS=',' read -ra OVERRIDE_PATHS <<< "$OVERRIDES_PATH"
+for path in "${OVERRIDE_PATHS[@]}"; do
+  # Trim whitespace
+  path=$(echo "$path" | xargs)
+  OVERRIDE_WORKFLOW_PATH="$path/scope/workflows/$ACTION_TO_EXECUTE.yaml"
+  if [[ -f "$OVERRIDE_WORKFLOW_PATH" ]]; then
+    CMD="$CMD --overrides $OVERRIDE_WORKFLOW_PATH"
+  fi
+done
 
 echo "Executing command: $CMD"
 eval $CMD