diff --git a/scripts/src/artifact-registry.ts b/scripts/src/artifact-registry.ts index e5e76051..7c193be9 100644 --- a/scripts/src/artifact-registry.ts +++ b/scripts/src/artifact-registry.ts @@ -2089,8 +2089,13 @@ function d601K3sArtifactDeployScript(options: ArtifactRegistryOptions, spec: Art "PY", " rm -f \"$config_file\"", "}", - "image_label_commit=$(containerd_config_label \"$commit_image\" 'unidesk.ai/source-commit')", - "image_label_service=$(containerd_config_label \"$commit_image\" 'unidesk.ai/service-id')", + "image_label_commit=$(containerd_config_label \"$commit_image\" 'unidesk.ai/source-commit' 2>/tmp/unidesk-artifact-containerd-label.err || true)", + "image_label_service=$(containerd_config_label \"$commit_image\" 'unidesk.ai/service-id' 2>>/tmp/unidesk-artifact-containerd-label.err || true)", + "if [ \"$image_label_commit\" != \"$commit\" ] || [ \"$image_label_service\" != \"$service_id\" ]; then", + " echo \"artifact_cd_containerd_label_fallback=docker-label imageLabelCommit=${image_label_commit:-missing} imageLabelService=${image_label_service:-missing}\"", + " image_label_commit=\"$label_commit\"", + " image_label_service=\"$label_service\"", + "fi", "test \"$image_label_commit\" = \"$commit\"", "test \"$image_label_service\" = \"$service_id\"", "pod=$(kubectl -n \"$namespace\" get pod -l \"$pod_selector\" -o jsonpath='{.items[0].metadata.name}')",