bakery-admin/bakery-ia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temp: Use folder-based image names to match existing registry [skip ci]

Browse Source 
This is a temporary workaround to test Flux reconciliation.
The registry currently has images stored with folder names (auth, tenant, etc.)
instead of service names (auth-service, tenant-service, etc.).

The permanent fix in task-kaniko-build.yaml will push with correct names
on the next full pipeline run.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Bakery Admin
2026-01-23 15:44:28 +01:00
parent ae996cedfd
commit dac79a4ad6
22 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
infrastructure/cicd/tekton-helm/templates/task-update-gitops.yaml
View File

@@ -105,39 +105,49 @@ spec:
elif [ "$service" = "frontend" ]; then
MANIFEST_PATH="infrastructure/services/microservices/frontend/frontend-service.yaml"
IMAGE_NAME="dashboard" # frontend service uses "dashboard" as image name
elif [ "$service" = "alert-processor" ]; then
MANIFEST_PATH="infrastructure/services/microservices/alert-processor/alert-processor.yaml"
IMAGE_NAME="alert-processor"
else
# For microservices, look in the microservices directory
# Convert service name to directory format (kebab-case)
service_dir=$(echo "$service" | sed 's/_/-/g')
# For microservices, convert service name to directory format
# Service names come in as "auth-service", "tenant-service", etc.
# Directory names are "auth", "tenant", etc. (without -service suffix)
# But some services like "demo-session-service" have dir "demo-session"
# Remove -service suffix if present for directory name
if echo "$service" | grep -q '\-service$'; then
service_dir=$(echo "$service" | sed 's/-service$//')
else
service_dir="$service"
fi
# Check for different possible manifest file names
if [ -f "infrastructure/services/microservices/$service_dir/deployment.yaml" ]; then
MANIFEST_PATH="infrastructure/services/microservices/$service_dir/deployment.yaml"
elif [ -f "infrastructure/services/microservices/$service_dir/${formatted_service}-service.yaml" ]; then
MANIFEST_PATH="infrastructure/services/microservices/$service_dir/${formatted_service}-service.yaml"
elif [ -f "infrastructure/services/microservices/$service_dir/${service_dir}-service.yaml" ]; then
MANIFEST_PATH="infrastructure/services/microservices/$service_dir/${service_dir}-service.yaml"
elif [ -f "infrastructure/services/microservices/$service_dir/${service}.yaml" ]; then
MANIFEST_PATH="infrastructure/services/microservices/$service_dir/${service}.yaml"
else
# Default to the standard naming pattern
MANIFEST_PATH="infrastructure/services/microservices/$service_dir/${formatted_service}-service.yaml"
MANIFEST_PATH="infrastructure/services/microservices/$service_dir/${service_dir}-service.yaml"
fi
# For most services, the image name follows the pattern service-name-service
IMAGE_NAME="${service_dir}-service"
# Image name is the service name as-is (e.g., auth-service, tenant-service)
IMAGE_NAME="$service"
fi
# Update the image tag in the deployment YAML
if [ -f "$MANIFEST_PATH" ]; then
# Update image reference from bakery/image_name:tag to registry/image_name:git_revision
# Handle various image name formats that might exist in the manifests
# Use a broad pattern to match any existing tag (including sha256 hashes)
sed -i "s|image: bakery/${IMAGE_NAME}:.*|image: $(params.registry)/${IMAGE_NAME}:$(params.git-revision)|g" "$MANIFEST_PATH"
# Also handle the case where the image name might be formatted differently
sed -i "s|image: bakery/${service}:.*|image: $(params.registry)/${service}:$(params.git-revision)|g" "$MANIFEST_PATH"
sed -i "s|image: bakery/${formatted_service}:.*|image: $(params.registry)/${formatted_service}:$(params.git-revision)|g" "$MANIFEST_PATH"
echo "Updated image in: $MANIFEST_PATH for image: bakery/${IMAGE_NAME}:* -> $(params.registry)/${IMAGE_NAME}:$(params.git-revision)"
echo "Updated image in: $MANIFEST_PATH -> $(params.registry)/${IMAGE_NAME}:$(params.git-revision)"
else
echo "Warning: Manifest file not found: $MANIFEST_PATH"
echo " Tried: $MANIFEST_PATH"
echo " Service: $service, service_dir: $service_dir, IMAGE_NAME: $IMAGE_NAME"
fi
fi
done