Merge branch 'main' into test-driver-did-bsv

Author: BernhardFuchs

ci/deploy-k8s-aws/scripts/deploy-services.sh

@@ -70,6 +70,7 @@ extract_image_info() {
 #   $3 - Ports (JSON array)
 #   $4 - Environment variables (JSON object)
 #   $5 - Environment file reference (from docker-compose)
+#   $6 - Command (string or JSON array)
 #
 # Output:
 #   deployment-${service_name}.yaml
@@ -80,6 +81,7 @@ create_deployment_yaml() {
     local ports=$3
     local env_vars=$4
     local env_file=$5
+    local command=$6
 
     echo "Generating deployment manifest for $service_name..."
 
@@ -109,6 +111,23 @@ spec:
         imagePullPolicy: $([ "${image##*:}" == "latest" ] && echo "Always" || echo "IfNotPresent")
 EOF
 
+    # Add command as args if defined (docker-compose command -> k8s args)
+    if [ ! -z "$command" ] && [ "$command" != "null" ]; then
+        echo "        args:" >> "deployment-${service_name}.yaml"
+        # Check if command is a JSON array or a string
+        if echo "$command" | jq -e 'type == "array"' >/dev/null 2>&1; then
+            # Command is an array
+            echo "$command" | jq -r '.[]' | while read -r cmd_part; do
+                echo "        - \"$cmd_part\"" >> "deployment-${service_name}.yaml"
+            done
+        else
+            # Command is a string - split by spaces or use as single entry
+            cmd_str=$(echo "$command" | jq -r '.')
+            # For a simple string command like "start", add it as a single array element
+            echo "        - \"$cmd_str\"" >> "deployment-${service_name}.yaml"
+        fi
+    fi
+
     # Add container ports if defined
     if [ ! -z "$ports" ] && [ "$ports" != "null" ]; then
         echo "        ports:" >> "deployment-${service_name}.yaml"
@@ -131,7 +150,32 @@ EOF
     # Add specific environment variables if defined in docker-compose
     if [ "$env_vars" != "null" ] && [ "$env_vars" != "{}" ]; then
         echo "        env:" >> "deployment-${service_name}.yaml"
-        echo "$env_vars" | jq -r 'to_entries | .[] | "        - name: " + .key + "\n          value: \"" + (.value | tostring) + "\""' >> "deployment-${service_name}.yaml"
+
+        # Process each environment variable
+        echo "$env_vars" | jq -r 'to_entries | .[]' | jq -c '.' | while read -r entry; do
+            key=$(echo "$entry" | jq -r '.key')
+            value=$(echo "$entry" | jq -r '.value // ""')
+
+            # Check if value is a variable reference like ${VAR_NAME}
+            if [[ "$value" =~ ^\$\{([^}]+)\}$ ]]; then
+                # Extract the ConfigMap key name (remove ${ and })
+                configmap_key="${BASH_REMATCH[1]}"
+
+                # Use valueFrom to reference the ConfigMap key
+                cat >> "deployment-${service_name}.yaml" << EOF
+        - name: $key
+          valueFrom:
+            configMapKeyRef:
+              name: app-config
+              key: $configmap_key
+              optional: true
+EOF
+            else
+                # Use literal value (for non-variable-reference values)
+                echo "        - name: $key" >> "deployment-${service_name}.yaml"
+                echo "          value: \"$value\"" >> "deployment-${service_name}.yaml"
+            fi
+        done
     fi
 
     echo "✓ Deployment manifest created: deployment-${service_name}.yaml"
@@ -202,6 +246,9 @@ EOF
 # Initialize processed services tracker
 > processed_services.txt
 
+# Initialize failed deployments tracker
+> failed_deployments.txt
+
 # Get list of current deployments in namespace
 echo "Fetching current deployments in namespace $NAMESPACE..."
 kubectl get deployments -n "$NAMESPACE" -o json 2>/dev/null | jq -r '.items[].metadata.name' > current_deployments.txt || touch current_deployments.txt
@@ -219,6 +266,7 @@ cat services.json | jq -c '.' | while read -r service; do
     ports=$(echo "$service" | jq -c '.ports')
     env_vars=$(echo "$service" | jq -c '.environment')
     env_file=$(echo "$service" | jq -c '.env_file')
+    command=$(echo "$service" | jq -c '.command')
 
     echo ""
     echo "===================================================================="
@@ -247,7 +295,8 @@ cat services.json | jq -c '.' | while read -r service; do
                 echo "✓ Deployment updated successfully"
             else
                 echo "✗ Deployment rollout failed or timed out"
-                exit 1
+                echo "  ⚠ Continuing with remaining deployments..."
+                echo "$name|update-timeout" >> failed_deployments.txt
             fi
         else
             echo "✓ Image is up to date, no action needed"
@@ -256,7 +305,7 @@ cat services.json | jq -c '.' | while read -r service; do
         echo "⚡ Deployment '$name' does not exist, creating new deployment..."
 
         # Create deployment manifest
-        create_deployment_yaml "$name" "$image" "$ports" "$env_vars" "$env_file"
+        create_deployment_yaml "$name" "$image" "$ports" "$env_vars" "$env_file" "$command"
 
         # Apply deployment
         kubectl apply -f "deployment-${name}.yaml"
@@ -275,7 +324,8 @@ cat services.json | jq -c '.' | while read -r service; do
             echo "✓ Deployment is ready"
         else
             echo "✗ Deployment failed to become ready"
-            exit 1
+            echo "  ⚠ Continuing with remaining deployments..."
+            echo "$name|create-timeout" >> failed_deployments.txt
         fi
     fi
 
@@ -287,3 +337,28 @@ echo ""
 echo "===================================================================="
 echo "All services from docker-compose.yml have been processed"
 echo "===================================================================="
+
+# Check for failed deployments
+if [ -s failed_deployments.txt ]; then
+    echo ""
+    echo "⚠ WARNING: Some deployments encountered issues:"
+    echo ""
+    while IFS='|' read -r service reason; do
+        case "$reason" in
+            update-timeout)
+                echo "  - $service: Update rollout timed out"
+                ;;
+            create-timeout)
+                echo "  - $service: New deployment failed to become ready"
+                ;;
+        esac
+    done < failed_deployments.txt
+    echo ""
+    echo "These services were deployed but may not be fully operational."
+    echo "Check the verification step for current status."
+    echo ""
+else
+    echo ""
+    echo "✓ All deployments completed successfully"
+    echo ""
+fi

docker-compose.yml

@@ -73,7 +73,6 @@ services:
       uniresolver_web_driver_url_did_evrc:
       uniresolver_web_driver_url_did_keri:
       uniresolver_web_driver_url_did_webs:
-      uniresolver_web_driver_url_did_content:
       uniresolver_web_driver_url_did_prism:
       uniresolver_web_driver_url_did_iden3:
       uniresolver_web_driver_url_did_cndid: