From 99561dbc7e4b97855a458d8ce00474e75aa079d0 Mon Sep 17 00:00:00 2001
From: Tim Ebert <timebertt@gmail.com>
Date: Wed, 22 Mar 2023 16:25:32 +0100
Subject: [PATCH] Fix copy images job (#640)

* Fix calico images copy configuration

* Exit early if copying of one image failed

* Also highlight `Error:` log lines
---
 config/images/copy-images.sh | 8 ++++++--
 config/images/images.yaml    | 7 ++-----
 config/prow/config.yaml      | 1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/config/images/copy-images.sh b/config/images/copy-images.sh
index 460b2d1b4..3f292b93d 100755
--- a/config/images/copy-images.sh
+++ b/config/images/copy-images.sh
@@ -1,4 +1,8 @@
-#!/bin/sh
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
 
 filepath="$1"
 if [ -z "$filepath" ] ; then
@@ -15,4 +19,4 @@ for source in $(yq '.images[].source' "$filepath"); do
         # Copy the container image for the current tag using crane
         crane copy "$source:$tag" "$destination:$tag"
     done
-done
\ No newline at end of file
+done
diff --git a/config/images/images.yaml b/config/images/images.yaml
index d5e587129..0ac5c59da 100644
--- a/config/images/images.yaml
+++ b/config/images/images.yaml
@@ -48,13 +48,10 @@ images:
   tags:
   - v20220512-507ff70b
 # gardener-extension-networking-calico/charts/images.yaml
-- source: projectcalico/calico
-  destination: eu.gcr.io/gardener-project/3rd/projectcalico/calico
-  tags:
-  - v3.25.0
 - source: calico/node
   destination: eu.gcr.io/gardener-project/3rd/calico/node
   tags:
+  - v3.25.0
   - v3.22.2
 - source: calico/cni
   destination: eu.gcr.io/gardener-project/3rd/calico/cni
@@ -74,4 +71,4 @@ images:
 - source: calico/pod2daemon-flexvol
   destination: eu.gcr.io/gardener-project/3rd/calico/pod2daemon-flexvol
   tags:
-  - v3.22.2
\ No newline at end of file
+  - v3.22.2
diff --git a/config/prow/config.yaml b/config/prow/config.yaml
index 28b1a7561..fa6be7fb0 100644
--- a/config/prow/config.yaml
+++ b/config/prow/config.yaml
@@ -64,6 +64,7 @@ deck:
           highlight_regexes:
           - "[tT]imed out"
           - "ERROR:"
+          - "Error:"
           - (FAIL|Failure \[|FAILED)\b
           - panic\b
           - level=fatal\b