From d24f648db8eefae4649bf683b254f0a47640ba32 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 24 May 2023 11:32:14 -0700 Subject: [PATCH] Revert "Migrate statsd sidecar container images to quay.io" This reverts commit 4a762a6a8a9bc6c4364e8a4b3588326e4fc40982. A partial revert of 13cfceaea43f1ddc1dc4431da843e9d92e73e426 is also performed to swap out zookeeper-statsd without affecting other images. We perform this revert because Docker cannot do speculative gating of images hosted anywhere but on docker.io. Speculative testing of container images is an important feature that we wish to keep so revert until we can stop relying on Docker. Change-Id: I7ceafdb7cf1dfd4812ea8f12f273f01045ca89a2 --- docker/haproxy-statsd/Dockerfile | 4 +++- docker/zookeeper-statsd/Dockerfile | 4 ++-- .../haproxy/templates/docker-compose.yaml.j2 | 2 +- .../files/zookeeper-compose/docker-compose.yaml | 2 +- zuul.d/docker-images/haproxy.yaml | 15 +++++---------- zuul.d/docker-images/zookeeper-statsd.yaml | 15 +++++---------- 6 files changed, 17 insertions(+), 25 deletions(-) diff --git a/docker/haproxy-statsd/Dockerfile b/docker/haproxy-statsd/Dockerfile index db86fa3270..43165a3b3b 100644 --- a/docker/haproxy-statsd/Dockerfile +++ b/docker/haproxy-statsd/Dockerfile @@ -13,7 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/opendevorg/python-base:3.11-bullseye +# Wed May 24 18:38:17 UTC 2023 - trigger rebuild + +FROM docker.io/opendevorg/python-base:3.11-bullseye COPY haproxy-statsd.py /usr/local/bin RUN pip install statsd diff --git a/docker/zookeeper-statsd/Dockerfile b/docker/zookeeper-statsd/Dockerfile index a026a5acab..e1e9519b9d 100644 --- a/docker/zookeeper-statsd/Dockerfile +++ b/docker/zookeeper-statsd/Dockerfile @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Mon May 1 19:42:37 UTC 2023 - trigger rebuild +# Wed May 24 18:38:17 UTC 2023 - trigger rebuild -FROM quay.io/opendevorg/python-base:3.9-bullseye +FROM docker.io/opendevorg/python-base:3.9-bullseye COPY zookeeper-statsd.py /usr/local/bin RUN pip install statsd diff --git a/playbooks/roles/haproxy/templates/docker-compose.yaml.j2 b/playbooks/roles/haproxy/templates/docker-compose.yaml.j2 index c7216c5546..04488bde3f 100644 --- a/playbooks/roles/haproxy/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/haproxy/templates/docker-compose.yaml.j2 @@ -46,7 +46,7 @@ services: {% if haproxy_run_statsd %} haproxy-statsd: restart: always - image: quay.io/opendevorg/haproxy-statsd:latest + image: docker.io/opendevorg/haproxy-statsd:latest network_mode: host user: "1000:1000" volumes: diff --git a/playbooks/roles/zookeeper/files/zookeeper-compose/docker-compose.yaml b/playbooks/roles/zookeeper/files/zookeeper-compose/docker-compose.yaml index d79de9b908..d04ee0184c 100644 --- a/playbooks/roles/zookeeper/files/zookeeper-compose/docker-compose.yaml +++ b/playbooks/roles/zookeeper/files/zookeeper-compose/docker-compose.yaml @@ -16,7 +16,7 @@ services: - "/var/zookeeper/tls:/tls" zookeeper-statsd: restart: always - image: quay.io/opendevorg/zookeeper-statsd:latest + image: docker.io/opendevorg/zookeeper-statsd:latest network_mode: host user: "10001:10001" environment: diff --git a/zuul.d/docker-images/haproxy.yaml b/zuul.d/docker-images/haproxy.yaml index 0e1b796bd3..9fa863afae 100644 --- a/zuul.d/docker-images/haproxy.yaml +++ b/zuul.d/docker-images/haproxy.yaml @@ -2,18 +2,13 @@ - job: name: system-config-build-image-haproxy-statsd description: Build a haproxy-statsd image. - parent: system-config-build-container-image + parent: system-config-build-image requires: python-base-3.11-bullseye-container-image provides: haproxy-statsd-container-image vars: &haproxy-statsd_vars - promote_container_image_job: system-config-upload-image-haproxy-statsd - container_images: + docker_images: - context: docker/haproxy-statsd - registry: quay.io - repository: quay.io/opendevorg/haproxy-statsd - namespace: opendevorg - repo_shortname: haproxy-statsd - repo_description: Tool to report HaProxy stats to statsd + repository: opendevorg/haproxy-statsd # Duplicate in the run-gitea job files: &haproxy-statsd_files - docker/haproxy-statsd/ @@ -22,7 +17,7 @@ - job: name: system-config-upload-image-haproxy-statsd description: Build and upload a haproxy-statsd image. - parent: system-config-upload-container-image + parent: system-config-upload-image requires: python-base-3.11-bullseye-container-image provides: haproxy-statsd-container-image vars: *haproxy-statsd_vars @@ -31,6 +26,6 @@ - job: name: system-config-promote-image-haproxy-statsd description: Promote a previously published haproxy-statsd image to latest. - parent: system-config-promote-container-image + parent: system-config-promote-image vars: *haproxy-statsd_vars files: *haproxy-statsd_files diff --git a/zuul.d/docker-images/zookeeper-statsd.yaml b/zuul.d/docker-images/zookeeper-statsd.yaml index f9c2ce055c..445dec4c97 100644 --- a/zuul.d/docker-images/zookeeper-statsd.yaml +++ b/zuul.d/docker-images/zookeeper-statsd.yaml @@ -2,17 +2,12 @@ - job: name: system-config-build-image-zookeeper-statsd description: Build a zookeeper-statsd image. - parent: system-config-build-container-image + parent: system-config-build-image requires: python-base-3.9-bullseye-container-image vars: &zookeeper-statsd_vars - promote_container_image_job: system-config-upload-image-zookeeper-statsd - container_images: + docker_images: - context: docker/zookeeper-statsd - registry: quay.io - repository: quay.io/opendevorg/zookeeper-statsd - namespace: opendevorg - repo_shortname: zookeeper-statsd - repo_description: Tool to report ZooKeeper stats to statsd + repository: opendevorg/zookeeper-statsd files: &zookeeper-statsd_files - docker/zookeeper-statsd/ - docker/python-base/ @@ -20,7 +15,7 @@ - job: name: system-config-upload-image-zookeeper-statsd description: Build and upload a zookeeper-statsd image. - parent: system-config-upload-container-image + parent: system-config-upload-image requires: python-base-3.9-bullseye-container-image vars: *zookeeper-statsd_vars files: *zookeeper-statsd_files @@ -28,6 +23,6 @@ - job: name: system-config-promote-image-zookeeper-statsd description: Promote a previously published zookeeper-statsd image to latest. - parent: system-config-promote-container-image + parent: system-config-promote-image vars: *zookeeper-statsd_vars files: *zookeeper-statsd_files