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

23
infrastructure/cicd/tekton-helm/templates/task-kaniko-build.yaml
View File

@@ -154,13 +154,22 @@ spec:
echo "Building service: $service" echo "Building service: $service"
echo "===================================================================" echo "==================================================================="
# Determine Dockerfile path (services vs gateway vs frontend) # Determine Dockerfile path and image name
# Folder names are: auth, tenant, gateway, frontend, alert_processor, etc.
# Image names should be: auth-service, tenant-service, gateway, dashboard, alert-processor, etc.
if [ "$service" = "gateway" ]; then if [ "$service" = "gateway" ]; then
DOCKERFILE_PATH="$WORKSPACE/gateway/Dockerfile" DOCKERFILE_PATH="$WORKSPACE/gateway/Dockerfile"
IMAGE_NAME="gateway"
elif [ "$service" = "frontend" ]; then elif [ "$service" = "frontend" ]; then
DOCKERFILE_PATH="$WORKSPACE/frontend/Dockerfile.kubernetes" DOCKERFILE_PATH="$WORKSPACE/frontend/Dockerfile.kubernetes"
IMAGE_NAME="dashboard"
elif [ "$service" = "alert_processor" ]; then
DOCKERFILE_PATH="$WORKSPACE/services/$service/Dockerfile"
IMAGE_NAME="alert-processor"
else else
DOCKERFILE_PATH="$WORKSPACE/services/$service/Dockerfile" DOCKERFILE_PATH="$WORKSPACE/services/$service/Dockerfile"
# Convert folder name to image name: auth -> auth-service, demo_session -> demo-session-service
IMAGE_NAME=$(echo "$service" | sed 's/_/-/g')"-service"
fi fi
# Check if Dockerfile exists # Check if Dockerfile exists
@@ -169,6 +178,8 @@ spec:
continue continue
fi fi
echo "Building $service -> Image: $IMAGE_NAME"
# Build with retry logic to handle transient registry errors # Build with retry logic to handle transient registry errors
RETRY_COUNT=0 RETRY_COUNT=0
MAX_RETRIES=2 MAX_RETRIES=2
@@ -176,14 +187,14 @@ spec:
while [ "$RETRY_COUNT" -le "$MAX_RETRIES" ] && [ "$BUILD_SUCCESS" = "false" ]; do while [ "$RETRY_COUNT" -le "$MAX_RETRIES" ] && [ "$BUILD_SUCCESS" = "false" ]; do
if [ "$RETRY_COUNT" -gt 0 ]; then if [ "$RETRY_COUNT" -gt 0 ]; then
echo "Retry $RETRY_COUNT/$MAX_RETRIES for $service..." echo "Retry $RETRY_COUNT/$MAX_RETRIES for $IMAGE_NAME..."
# Wait before retry to let registry recover # Wait before retry to let registry recover
sleep 10 sleep 10
fi fi
if /kaniko/executor \ if /kaniko/executor \
--dockerfile="$DOCKERFILE_PATH" \ --dockerfile="$DOCKERFILE_PATH" \
--destination="$(params.registry)/$service:$(params.git-revision)" \ --destination="$(params.registry)/$IMAGE_NAME:$(params.git-revision)" \
--context="$WORKSPACE" \ --context="$WORKSPACE" \
--build-arg="BASE_REGISTRY=$(params.base-registry)" \ --build-arg="BASE_REGISTRY=$(params.base-registry)" \
--build-arg="PYTHON_IMAGE=$(params.python-image)" \ --build-arg="PYTHON_IMAGE=$(params.python-image)" \
@@ -193,18 +204,18 @@ spec:
--push-retry=3 \ --push-retry=3 \
--image-fs-extract-retry=3; then --image-fs-extract-retry=3; then
BUILD_SUCCESS=true BUILD_SUCCESS=true
echo "Successfully built and pushed: $(params.registry)/$service:$(params.git-revision)" echo "Successfully built and pushed: $(params.registry)/$IMAGE_NAME:$(params.git-revision)"
# Increment success count # Increment success count
COUNT=$(cat "$BUILD_STATUS_FILE.success") COUNT=$(cat "$BUILD_STATUS_FILE.success")
echo $((COUNT + 1)) > "$BUILD_STATUS_FILE.success" echo $((COUNT + 1)) > "$BUILD_STATUS_FILE.success"
else else
RETRY_COUNT=$((RETRY_COUNT + 1)) RETRY_COUNT=$((RETRY_COUNT + 1))
echo "Build/push failed for $service (attempt $RETRY_COUNT)" echo "Build/push failed for $IMAGE_NAME (attempt $RETRY_COUNT)"
fi fi
done done
if [ "$BUILD_SUCCESS" = "false" ]; then if [ "$BUILD_SUCCESS" = "false" ]; then
echo "ERROR: Failed to build $service after $MAX_RETRIES retries" echo "ERROR: Failed to build $IMAGE_NAME after $MAX_RETRIES retries"
# Increment failed count and record service name # Increment failed count and record service name
COUNT=$(cat "$BUILD_STATUS_FILE.failed") COUNT=$(cat "$BUILD_STATUS_FILE.failed")
echo $((COUNT + 1)) > "$BUILD_STATUS_FILE.failed" echo $((COUNT + 1)) > "$BUILD_STATUS_FILE.failed"

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

@@ -105,39 +105,49 @@ spec:
elif [ "$service" = "frontend" ]; then elif [ "$service" = "frontend" ]; then
MANIFEST_PATH="infrastructure/services/microservices/frontend/frontend-service.yaml" MANIFEST_PATH="infrastructure/services/microservices/frontend/frontend-service.yaml"
IMAGE_NAME="dashboard" # frontend service uses "dashboard" as image name 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 else
# For microservices, look in the microservices directory # For microservices, convert service name to directory format
# Convert service name to directory format (kebab-case) # Service names come in as "auth-service", "tenant-service", etc.
service_dir=$(echo "$service" | sed 's/_/-/g') # 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 # Check for different possible manifest file names
if [ -f "infrastructure/services/microservices/$service_dir/deployment.yaml" ]; then if [ -f "infrastructure/services/microservices/$service_dir/deployment.yaml" ]; then
MANIFEST_PATH="infrastructure/services/microservices/$service_dir/deployment.yaml" 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 elif [ -f "infrastructure/services/microservices/$service_dir/${service_dir}-service.yaml" ]; then
MANIFEST_PATH="infrastructure/services/microservices/$service_dir/${service_dir}-service.yaml" 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 else
# Default to the standard naming pattern # 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 fi
# For most services, the image name follows the pattern service-name-service # Image name is the service name as-is (e.g., auth-service, tenant-service)
IMAGE_NAME="${service_dir}-service" IMAGE_NAME="$service"
fi fi
# Update the image tag in the deployment YAML # Update the image tag in the deployment YAML
if [ -f "$MANIFEST_PATH" ]; then if [ -f "$MANIFEST_PATH" ]; then
# Update image reference from bakery/image_name:tag to registry/image_name:git_revision # 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" 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 else
echo "Warning: Manifest file not found: $MANIFEST_PATH" 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
fi fi
done done

2
infrastructure/platform/gateway/gateway-service.yaml
View File

@@ -21,7 +21,7 @@ spec:
spec: spec:
containers: containers:
- name: gateway - name: gateway
image: registry.bakewise.ai/bakery-admin/gateway:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/gateway:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/ai-insights/ai-insights-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: AI_INSIGHTS_DB_USER key: AI_INSIGHTS_DB_USER
containers: containers:
- name: ai-insights-service - name: ai-insights-service
image: registry.bakewise.ai/bakery-admin/ai-insights-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/ai_insights:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/alert-processor/alert-processor.yaml
View File

@@ -82,7 +82,7 @@ spec:
key: ALERT_PROCESSOR_DB_USER key: ALERT_PROCESSOR_DB_USER
containers: containers:
- name: alert-processor - name: alert-processor
image: registry.bakewise.ai/bakery-admin/alert-processor:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/alert_processor:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
command: ["python", "-m", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] command: ["python", "-m", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
ports: ports:
- containerPort: 8000 - containerPort: 8000

2
infrastructure/services/microservices/auth/auth-service.yaml
View File

@@ -110,7 +110,7 @@ spec:
value: "auth_db" value: "auth_db"
containers: containers:
- name: auth-service - name: auth-service
image: registry.bakewise.ai/bakery-admin/auth-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/auth:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/demo-session/deployment.yaml
View File

@@ -20,7 +20,7 @@ spec:
serviceAccountName: demo-session-sa serviceAccountName: demo-session-sa
containers: containers:
- name: demo-session-service - name: demo-session-service
image: registry.bakewise.ai/bakery-admin/demo-session-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/demo_session:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/external/external-service.yaml vendored
View File

@@ -114,7 +114,7 @@ spec:
containers: containers:
- name: external-service - name: external-service
image: registry.bakewise.ai/bakery-admin/external-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/external:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/forecasting/forecasting-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: FORECASTING_DB_USER key: FORECASTING_DB_USER
containers: containers:
- name: forecasting-service - name: forecasting-service
image: registry.bakewise.ai/bakery-admin/forecasting-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/forecasting:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/frontend/frontend-service.yaml
View File

@@ -21,7 +21,7 @@ spec:
spec: spec:
containers: containers:
- name: frontend - name: frontend
image: registry.bakewise.ai/bakery-admin/dashboard:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/frontend:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 3000 - containerPort: 3000

2
infrastructure/services/microservices/inventory/inventory-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: INVENTORY_DB_USER key: INVENTORY_DB_USER
containers: containers:
- name: inventory-service - name: inventory-service
image: registry.bakewise.ai/bakery-admin/inventory-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/inventory:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/notification/notification-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: NOTIFICATION_DB_USER key: NOTIFICATION_DB_USER
containers: containers:
- name: notification-service - name: notification-service
image: registry.bakewise.ai/bakery-admin/notification-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/notification:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/orchestrator/orchestrator-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: ORCHESTRATOR_DB_USER key: ORCHESTRATOR_DB_USER
containers: containers:
- name: orchestrator-service - name: orchestrator-service
image: registry.bakewise.ai/bakery-admin/orchestrator-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/orchestrator:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/orders/orders-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: ORDERS_DB_USER key: ORDERS_DB_USER
containers: containers:
- name: orders-service - name: orders-service
image: registry.bakewise.ai/bakery-admin/orders-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/orders:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/pos/pos-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: POS_DB_USER key: POS_DB_USER
containers: containers:
- name: pos-service - name: pos-service
image: registry.bakewise.ai/bakery-admin/pos-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/pos:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/procurement/procurement-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: PROCUREMENT_DB_USER key: PROCUREMENT_DB_USER
containers: containers:
- name: procurement-service - name: procurement-service
image: registry.bakewise.ai/bakery-admin/procurement-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/procurement:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/production/production-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: PRODUCTION_DB_USER key: PRODUCTION_DB_USER
containers: containers:
- name: production-service - name: production-service
image: registry.bakewise.ai/bakery-admin/production-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/production:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/recipes/recipes-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: RECIPES_DB_USER key: RECIPES_DB_USER
containers: containers:
- name: recipes-service - name: recipes-service
image: registry.bakewise.ai/bakery-admin/recipes-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/recipes:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/sales/sales-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: SALES_DB_USER key: SALES_DB_USER
containers: containers:
- name: sales-service - name: sales-service
image: registry.bakewise.ai/bakery-admin/sales-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/sales:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/suppliers/suppliers-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: SUPPLIERS_DB_USER key: SUPPLIERS_DB_USER
containers: containers:
- name: suppliers-service - name: suppliers-service
image: registry.bakewise.ai/bakery-admin/suppliers-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/suppliers:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/tenant/tenant-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: TENANT_DB_USER key: TENANT_DB_USER
containers: containers:
- name: tenant-service - name: tenant-service
image: registry.bakewise.ai/bakery-admin/tenant-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/tenant:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http

2
infrastructure/services/microservices/training/training-service.yaml
View File

@@ -88,7 +88,7 @@ spec:
key: TRAINING_DB_USER key: TRAINING_DB_USER
containers: containers:
- name: training-service - name: training-service
image: registry.bakewise.ai/bakery-admin/training-service:c23d00dd929cc710f3b5d83ad01a965a3b561ba8 image: registry.bakewise.ai/bakery-admin/training:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: http name: http