Skip to content

Commit 031192d

Browse files
committed
refactor(ci): extract latest image ref to variable, add dashboard rollout restart
- Use CONTROLPLANE_LATEST_IMAGE variable instead of hardcoded image ref - Add dashboard deployment restart to pick up :latest image changes
1 parent 03c992b commit 031192d

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

scripts/ci/build-controlplane-image.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
set -euo pipefail
33

44
CONTROLPLANE_IMAGE="${CONTROLPLANE_IMAGE:?CONTROLPLANE_IMAGE is required}"
5+
CONTROLPLANE_LATEST_IMAGE="${CONTROLPLANE_LATEST_IMAGE:-ghcr.io/nantian-gw/nantian-controlplane:latest}"
56

67
docker build -t "$CONTROLPLANE_IMAGE" .
7-
docker tag "$CONTROLPLANE_IMAGE" ghcr.io/nantian-gw/nantian-controlplane:latest
8+
docker tag "$CONTROLPLANE_IMAGE" "$CONTROLPLANE_LATEST_IMAGE"
89
docker image inspect "$CONTROLPLANE_IMAGE" >/dev/null
910
echo "Built control-plane image: $CONTROLPLANE_IMAGE"

scripts/ci/load-kind-images.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ DATAPLANE_IMAGE="${DATAPLANE_IMAGE:-$DEFAULT_DATAPLANE_IMAGE}"
1111
DASHBOARD_IMAGE="${DASHBOARD_IMAGE:-$DEFAULT_DASHBOARD_IMAGE}"
1212
KIND_DATAPLANE_IMAGE="${KIND_DATAPLANE_IMAGE:-$(kind_runtime_image_ref "$DATAPLANE_IMAGE")}"
1313
KIND_DASHBOARD_IMAGE="${KIND_DASHBOARD_IMAGE:-$(kind_runtime_image_ref "$DASHBOARD_IMAGE")}"
14+
CONTROLPLANE_LATEST_IMAGE="${CONTROLPLANE_LATEST_IMAGE:-ghcr.io/nantian-gw/nantian-controlplane:latest}"
1415

1516
docker pull "$DATAPLANE_IMAGE"
1617
docker pull "$DASHBOARD_IMAGE"
@@ -24,13 +25,14 @@ docker tag "$dataplane_image_id" "$KIND_DATAPLANE_IMAGE"
2425
docker tag "$dashboard_image_id" "$KIND_DASHBOARD_IMAGE"
2526

2627
kind load docker-image "$CONTROLPLANE_IMAGE" --name "$CLUSTER_NAME"
27-
kind load docker-image ghcr.io/nantian-gw/nantian-controlplane:latest --name "$CLUSTER_NAME"
28+
kind load docker-image "$CONTROLPLANE_LATEST_IMAGE" --name "$CLUSTER_NAME"
2829
kind load docker-image "$KIND_DATAPLANE_IMAGE" --name "$CLUSTER_NAME"
2930
kind load docker-image "$KIND_DASHBOARD_IMAGE" --name "$CLUSTER_NAME"
3031

3132
# Force restart control plane pods to pick up the latest image if they exist
3233
kubectl rollout restart deployment/nantian-gw-controlplane -n nantian-gw --ignore-not-found=true 2>/dev/null || true
3334
kubectl rollout restart deployment/nantian-gw-dataplane -n nantian-gw --ignore-not-found=true 2>/dev/null || true
35+
kubectl rollout restart deployment/nantian-gw-dashboard -n nantian-gw --ignore-not-found=true 2>/dev/null || true
3436

3537
if [[ -n "${GITHUB_ENV:-}" ]]; then
3638
{

0 commit comments

Comments
 (0)