From 7cac1f7609efbff72736e4f05451d34f0cd84906 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Thu, 26 Nov 2020 17:10:22 +0100
Subject: [PATCH] ci: remove docker mirror configuration

Instead of using a mirror, the CI registry is now pupulated with
container images that get pulled and tagged as if they get from Docker
Hub or other locations.

This is more of a manual mirror, as the Docker Registry mirror
functionality is not flexible enough for our usecase (push images
without providing them on docker.io).

Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 container-registry.conf        | 17 -----------------
 deploy/container-registry.yaml |  5 -----
 deploy/registry-config.yml.in  | 32 --------------------------------
 3 files changed, 54 deletions(-)
 delete mode 100644 container-registry.conf
 delete mode 100644 deploy/registry-config.yml.in

diff --git a/container-registry.conf b/container-registry.conf
deleted file mode 100644
index 8c02b936f..000000000
--- a/container-registry.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# /etc/containers/registries.conf
-#
-# This file contains the registry that is hosted in the CentOS CI OpenShift
-# deployment for Ceph-CSI.
-#
-# By overwriting /etc/containers/registries.conf, short-names for
-# container-images can NOT be used anymore.
-#
-# The CI jobs do a "podman login" for the local registry. Only after that, the
-# local mirror is accessible.
-#
-
-[[registry]]
-prefix = "docker.io"
-location = "docker.io"
-[[registry.mirror]]
-location = "registry-ceph-csi.apps.ocp.ci.centos.org"
diff --git a/deploy/container-registry.yaml b/deploy/container-registry.yaml
index 27507b103..f0c8f8cce 100644
--- a/deploy/container-registry.yaml
+++ b/deploy/container-registry.yaml
@@ -49,8 +49,6 @@ spec:
           volumeMounts:
             - name: container-images
               mountPath: /var/lib/registry
-            - name: config
-              mountPath: /etc/docker/registry
             - name: htpasswd
               mountPath: /auth
           env:
@@ -64,9 +62,6 @@ spec:
         - name: container-images
           persistentVolumeClaim:
             claimName: ceph-csi-image-registry
-        - name: config
-          secret:
-            secretName: container-registry-config
         - name: htpasswd
           secret:
             secretName: container-registry-auth
diff --git a/deploy/registry-config.yml.in b/deploy/registry-config.yml.in
deleted file mode 100644
index 444fef363..000000000
--- a/deploy/registry-config.yml.in
+++ /dev/null
@@ -1,32 +0,0 @@
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: container-registry-config
-  labels:
-    app: container-registry
-stringData:
-  # /etc/docker/registry/config.yml
-  config.yml: |-
-    version: 0.1
-    log:
-      fields:
-        service: registry
-    storage:
-      cache:
-        blobdescriptor: inmemory
-      filesystem:
-        rootdirectory: /var/lib/registry
-    http:
-      addr: :5000
-      headers:
-        X-Content-Type-Options: [nosniff]
-    health:
-      storagedriver:
-        enabled: true
-        interval: 10s
-        threshold: 3
-    proxy:
-      remoteurl: https://docker.io
-      username: @@USERNAME@@
-      password: @@PASSWD@@