Merge pull request #14752 from hakman/etcd-manager-v3.0.20221209

Update etcd-manager to v3.0.20221209
kubernetes · Dec 9, 2022 · 9304500 · 9304500
2 parents 0ca5f20 + 09dc2c8
commit 9304500
Show file tree

Hide file tree

Showing 176 changed files with 180 additions and 181 deletions.
diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go
@@ -181,8 +181,7 @@ metadata:
 spec:
   containers:
   - name: etcd-manager
-    #image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220831
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     resources:
       requests:
         cpu: 100m

diff --git a/pkg/model/components/etcdmanager/tests/interval/tasks.yaml b/pkg/model/components/etcdmanager/tests/interval/tasks.yaml
@@ -86,7 +86,7 @@ Contents: |
         --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
         --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
         > /tmp/pipe 2>&1
-      image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+      image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
       name: etcd-manager
       resources:
         requests:
@@ -155,7 +155,7 @@ Contents: |
         --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
         --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
         > /tmp/pipe 2>&1
-      image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+      image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
       name: etcd-manager
       resources:
         requests:

diff --git a/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml b/pkg/model/components/etcdmanager/tests/minimal/tasks.yaml
@@ -85,7 +85,7 @@ Contents: |
         --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
         --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
         --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
-      image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+      image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
       name: etcd-manager
       resources:
         requests:
@@ -153,7 +153,7 @@ Contents: |
         --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
         --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
         --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
-      image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+      image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
       name: etcd-manager
       resources:
         requests:

diff --git a/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml b/pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml
@@ -88,7 +88,7 @@ Contents: |
       env:
       - name: ETCD_QUOTA_BACKEND_BYTES
         value: "10737418240"
-      image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+      image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
       name: etcd-manager
       resources:
         requests:
@@ -159,7 +159,7 @@ Contents: |
       env:
       - name: ETCD_QUOTA_BACKEND_BYTES
         value: "10737418240"
-      image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+      image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
       name: etcd-manager
       resources:
         requests:

diff --git a/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml b/pkg/model/components/etcdmanager/tests/proxy/tasks.yaml
@@ -94,7 +94,7 @@ Contents: |
         value: http://proxy.example.com
       - name: no_proxy
         value: noproxy.example.com
-      image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+      image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
       name: etcd-manager
       resources:
         requests:
@@ -171,7 +171,7 @@ Contents: |
         value: http://proxy.example.com
       - name: no_proxy
         value: noproxy.example.com
-      image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+      image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
       name: etcd-manager
       resources:
         requests:

diff --git a/...ditionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...ditionalobjects/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/additionalobjects.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...additionalobjects/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/additionalobjects.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/.../apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/.../apiservernodes/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -21,7 +21,7 @@ spec:
       --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
       --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
       > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...er/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...er/apiservernodes/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -21,7 +21,7 @@ spec:
       --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
       --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/minimal.example.com=owned
       > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...s-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...s-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...ional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...itional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...itional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/bastionuserdata.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...cluster/complex/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/complex.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...e_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...e_cluster/complex/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/complex.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...luster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...luster/compress/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/compress.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/..._cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/..._cluster/compress/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/compress.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ntainerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...ntainerd-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...containerd-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...ster/containerd/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...luster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...luster/containerd/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/containerd.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...e_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...e_cluster/digit/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/123.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ate_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...ate_cluster/digit/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/123.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...r/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...r/docker-custom/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/docker.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ter/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...ter/docker-custom/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/docker.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...er/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...er/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
       --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned
       > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...er/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/...er/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -18,7 +18,7 @@ spec:
       --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
       --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned
       > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...er/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/...er/existing_iam/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -18,7 +18,7 @@ spec:
       --v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
       --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned
       > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...ster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
       --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned
       > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/...ster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -18,7 +18,7 @@ spec:
       --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
       --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned
       > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/...ster/existing_iam/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -18,7 +18,7 @@ spec:
       --v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
       --volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/existing-iam.example.com=owned
       > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ter/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...ter/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ter/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content b/...ter/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1b_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ter/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content b/...ter/existing_sg/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1c_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...uster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...uster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...uster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content b/...uster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1b_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...uster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content b/...uster/existing_sg/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1c_content
@@ -19,7 +19,7 @@ spec:
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/existingsg.example.com=owned > /tmp/pipe
       2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...er/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...er/external_dns/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content b/...ster/external_dns/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3994 --v=6 --volume-name-tag=k8s.io/etcd/main
       --volume-provider=aws --volume-tag=k8s.io/etcd/main --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests:

diff --git a/...ternal_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content b/...ternal_dns_irsa/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content
@@ -18,7 +18,7 @@ spec:
       --quarantine-client-urls=https://__name__:3995 --v=6 --volume-name-tag=k8s.io/etcd/events
       --volume-provider=aws --volume-tag=k8s.io/etcd/events --volume-tag=k8s.io/role/control-plane=1
       --volume-tag=kubernetes.io/cluster/minimal.example.com=owned > /tmp/pipe 2>&1
-    image: gcr.io/k8s-staging-etcdadm/etcd-manager:v3.0.20220831-21-g12041b4c
+    image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20221209
     name: etcd-manager
     resources:
       requests: