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@@