Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .github/actions/docker/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,10 @@ runs:
;;
esac

# Transform K8S labels
if [ -z "${{ inputs.variant-path }}" ]; then
echo "k8s_labels=${{ inputs.k8s-labels }}" >> "$GITHUB_OUTPUT"
else
labels=(${{ inputs.k8s-labels }} variant=${{ inputs.variant-path }})
echo "k8s_labels=$(IFS=,;echo "${labels[*]}")" >> "$GITHUB_OUTPUT"
fi
# K8S rollout labels: pass through K8S_LABELS as-is.
# We no longer synthesize a `variant=<path>` selector — the rollout action now
# restarts by image (see infra/k8s/rollout), which needs no per-deployment label.
echo "k8s_labels=${{ inputs.k8s-labels }}" >> "$GITHUB_OUTPUT"
# Prep. docker environment
- name: Checkout
if: ${{ inputs.prepare-for-building == 'true' }}
Expand Down
37 changes: 24 additions & 13 deletions .github/actions/infra/k8s/rollout/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ inputs:
description: Target cluster ID
required: true
rollout-deployments:
description: List of deployments to rollout (comma separated)
description: Explicit list of deployments to rollout (comma separated). Overrides image/labels.
required: false
rollout-labels:
description: List of labels to rollout (comma separated)
description: Label selector to rollout (comma separated). Overrides image matching.
required: false
rollout-image:
description: >
Image reference (without tag) to match. Restarts every deployment whose pods run this image.
Used when neither rollout-deployments nor rollout-labels is set (the default mechanism).
required: false
rollout-namespace:
description: Rollout namespace filter
Expand Down Expand Up @@ -79,23 +84,29 @@ runs:
env:
DEPLOYMENTS: ${{ inputs.rollout-deployments }}
LABELS: ${{ inputs.rollout-labels }}
IMAGE: ${{ inputs.rollout-image }}
NS: ${{ inputs.rollout-namespace }}
run: |
# Restart multiple deployments
# Restart explicit deployments (override)
if [ -n "$DEPLOYMENTS" ]; then
for deployment in ${DEPLOYMENTS//,/ }; do
kubectl rollout restart deployment \
"$deployment" \
--namespace="${{ inputs.rollout-namespace }}"
kubectl rollout restart deployment "$deployment" --namespace="$NS"
done

# Restart multiple labels
# Restart by label selector (override)
elif [ -n "$LABELS" ]; then
kubectl rollout restart deployment \
--selector="$LABELS" \
--namespace="${{ inputs.rollout-namespace }}"
kubectl rollout restart deployment --selector="$LABELS" --namespace="$NS"

# Restart every deployment running the built image (default)
elif [ -n "$IMAGE" ]; then
kubectl get deployment --namespace="$NS" -o json \
| jq -r --arg img "$IMAGE" \
'.items[]
| select(any(.spec.template.spec.containers[]; .image | startswith($img + ":")))
| .metadata.name' \
| xargs -r kubectl rollout restart deployment --namespace="$NS"

# Restart everything
# Restart everything (fallback)
else
kubectl rollout restart deployment \
--namespace="${{ inputs.rollout-namespace }}"
kubectl rollout restart deployment --namespace="$NS"
fi
1 change: 1 addition & 0 deletions .github/workflows/docker-build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ jobs:
cluster-id: ${{ vars.K8S_CLUSTER_ID }}
rollout-deployments: ${{ vars.K8S_DEPLOYMENTS }}
rollout-labels: ${{ steps.setup.outputs.k8s-labels }}
rollout-image: ${{ steps.setup.outputs.registry }}/${{ steps.setup.outputs.image }}
rollout-namespace: ${{ vars.K8S_NAMESPACE }}
# Vendor: azure
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-promote-to-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ jobs:
cluster-id: ${{ vars.K8S_CLUSTER_ID }}
rollout-deployments: ${{ vars.K8S_DEPLOYMENTS }}
rollout-labels: ${{ steps.setup.outputs.k8s-labels }}
rollout-image: ${{ steps.setup.outputs.registry }}/${{ steps.setup.outputs.image }}
rollout-namespace: ${{ vars.K8S_NAMESPACE }}
# Vendor: azure
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down
Loading
Loading