From e78aa2bad24cb764ed5d570ead2603610daa1b49 Mon Sep 17 00:00:00 2001
From: Luca Burgazzoli <lburgazzoli@gmail.com>
Date: Fri, 9 Aug 2024 09:25:05 +0200
Subject: [PATCH] chore: switch to quay as gcr is deprecated

see https://cloud.google.com/container-registry/docs/deprecations/container-registry-deprecation

Signed-off-by: Luca Burgazzoli <lburgazzoli@gmail.com>
---
 .github/workflows/build-main.yml                              | 4 ++--
 .github/workflows/build-pr.yml                                | 4 ++--
 jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/Etcd.java | 2 +-
 jetcd-launcher/src/test/resources/log4j2.xml                  | 3 ---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
index 6cbb6c5e8..7b21bba27 100644
--- a/.github/workflows/build-main.yml
+++ b/.github/workflows/build-main.yml
@@ -42,8 +42,8 @@ jobs:
           - 17
           - 21
         etcd:
-          - gcr.io/etcd-development/etcd:v3.5.14
-          - gcr.io/etcd-development/etcd:v3.4.33
+          - quay.io/coreos/etcd:v3.5.14
+          - quay.io/coreos/etcd:v3.4.33
     uses: ./.github/workflows/build.yml
     with:
       javaVersion: "${{ matrix.java-version }}"
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 8b7077621..57a54beb3 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -43,8 +43,8 @@ jobs:
           - 17
           - 21
         etcd:
-          - gcr.io/etcd-development/etcd:v3.5.14
-          - gcr.io/etcd-development/etcd:v3.4.33
+          - quay.io/coreos/etcd:v3.5.14
+          - quay.io/coreos/etcd:v3.4.33
     uses: ./.github/workflows/build.yml
     with:
       javaVersion: "${{ matrix.java-version }}"
diff --git a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/Etcd.java b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/Etcd.java
index ed8fc2208..68e29dc28 100644
--- a/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/Etcd.java
+++ b/jetcd-launcher/src/main/java/io/etcd/jetcd/launcher/Etcd.java
@@ -28,7 +28,7 @@
 import com.google.common.base.Strings;
 
 public final class Etcd {
-    public static final String CONTAINER_IMAGE = "gcr.io/etcd-development/etcd:v3.5.14";
+    public static final String CONTAINER_IMAGE = "gquay.io/coreos/etcd:v3.5.14";
     public static final int ETCD_CLIENT_PORT = 2379;
     public static final int ETCD_PEER_PORT = 2380;
     public static final String ETCD_DATA_DIR = "/data.etcd";
diff --git a/jetcd-launcher/src/test/resources/log4j2.xml b/jetcd-launcher/src/test/resources/log4j2.xml
index 225fa2711..54f51ed21 100644
--- a/jetcd-launcher/src/test/resources/log4j2.xml
+++ b/jetcd-launcher/src/test/resources/log4j2.xml
@@ -27,9 +27,6 @@
   <Loggers>
     <!-- package loggers -->
     <Logger name="org.testcontainers" level="INFO"/>
-    <Logger name="🐳 [gcr.io/etcd-development/etcd:v3.3]" level="WARN"/>
-    <Logger name="🐳 [gcr.io/etcd-development/etcd:v3.4]" level="WARN"/>
-    <Logger name="🐳 [gcr.io/etcd-development/etcd:v3.4.7]" level="WARN"/>
     <Logger name="io.etcd.jetcd.internal.infrastructure" level="INFO"/>
     <Logger name="io.etcd.jetcd.launcher.EtcdCluster" level="WARN"/>