Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -768,101 +768,6 @@ spec:
# art_rpm_mirroring_services.py added the following resource
#---------------------------------------------------------------------------------

apiVersion: v1
kind: Service
metadata:
name: base-4-12-rhel85
namespace: ocp
spec:
ports:
- port: 80
targetPort: 8080
selector:
app: base-4-12-rhel85
type: ClusterIP
---
#---------------------------------------------------------------------------------
# art_rpm_mirroring_services.py added the following resource
#---------------------------------------------------------------------------------

apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"content-mirror:latest","namespace":"ci"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirror\")].image"}]'
labels:
app: base-4-12-rhel85
name: base-4-12-rhel85
namespace: ocp
spec:
replicas: 2
selector:
matchLabels:
app: base-4-12-rhel85
template:
metadata:
annotations:
cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
labels:
app: base-4-12-rhel85
spec:
containers:
- command:
- content-mirror
- --path=/tmp/config
- --max-size=5g
- --timeout=30m
- /tmp/repos
image: ' '
livenessProbe:
httpGet:
path: /rhel-8-baseos/repodata/repomd.xml
port: 8080
initialDelaySeconds: 120
periodSeconds: 120
name: mirror
ports:
- containerPort: 8080
name: http
resources:
requests:
memory: 500Mi
volumeMounts:
- mountPath: /tmp/repos
name: repos
readOnly: true
- mountPath: /tmp/key
name: key
readOnly: true
- mountPath: /tmp/mirror-enterprise-basic-auth
name: mirror-enterprise-basic-auth
readOnly: true
- mountPath: /tmp/cache
name: cache
workingDir: /tmp/repos
volumes:
- configMap:
items:
- key: ocp-4.12-rhel85.repo
path: ocp-4.12-rhel85.repo
name: base-repos
name: repos
- name: key
secret:
secretName: mirror.openshift.com
- name: mirror-enterprise-basic-auth
secret:
defaultMode: 420
secretName: mirror-enterprise-basic-auth
- emptyDir: {}
name: cache
- emptyDir: {}
name: run
---
#---------------------------------------------------------------------------------
# art_rpm_mirroring_services.py added the following resource
#---------------------------------------------------------------------------------

apiVersion: v1
kind: Service
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,6 @@ failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-advanced-virt]
name = rhel-8-advanced-virt
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/aarch64/advanced-virt/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-ansible-2.9]
name = rhel-8-ansible-2.9
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/aarch64/ansible/2.9/os/
Expand Down
31 changes: 0 additions & 31 deletions core-services/release-controller/_repos/ocp-4.11-rhel8.repo
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,6 @@ sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority

[rhel-8-server-ose]
name = rhel-8-server-ose
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.11/rhel-8-server-ose-rpms
sslverify = false
username_file=/tmp/mirror-enterprise-basic-auth/username
password_file=/tmp/mirror-enterprise-basic-auth/password
failovermethod = priority
skip_if_unavailable = true
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-fast-datapath]
name = rhel-8-fast-datapath
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/fast-datapath/os/
Expand All @@ -43,26 +32,6 @@ failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-nfv]
name = rhel-8-nfv
baseurl = https://cdn.redhat.com/content/tus/rhel8/8.4/x86_64/nfv/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-advanced-virt]
name = rhel-8-advanced-virt
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/x86_64/advanced-virt/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-ansible-2.9]
name = rhel-8-ansible-2.9
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/os/
Expand Down
46 changes: 0 additions & 46 deletions core-services/release-controller/_repos/ocp-4.11-rhel85.repo
Original file line number Diff line number Diff line change
Expand Up @@ -52,49 +52,3 @@ sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-advanced-virt]
name = rhel-8-advanced-virt
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/advanced-virt/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-ansible-2.9]
name = rhel-8-ansible-2.9
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
gpgcheck = 0
# https://projects.engineering.redhat.com/browse/RCM-65421
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority

[openstack-16-for-rhel-8-rpms]
name = openstack-16-for-rhel-8-rpms
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/openstack/16.2/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
gpgcheck = 0
# https://projects.engineering.redhat.com/browse/RCM-65421
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority

[rhel-8-codeready-builder-rpms]
name = rhel-8-codeready-builder-rpms
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/x86_64/codeready-builder/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
gpgcheck = 0
# https://projects.engineering.redhat.com/browse/RCM-65421
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
48 changes: 1 addition & 47 deletions core-services/release-controller/_repos/ocp-4.11-rhel86.repo
Original file line number Diff line number Diff line change
Expand Up @@ -45,56 +45,10 @@ gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release ht

[rhel-8-nfv]
name = rhel-8-nfv
baseurl = https://cdn.redhat.com/content/tus/rhel8/8.4/x86_64/nfv/os/
baseurl = https://cdn.redhat.com/content/tus/rhel8/8.6/x86_64/nfv/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-advanced-virt]
name = rhel-8-advanced-virt
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/x86_64/advanced-virt/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-ansible-2.9]
name = rhel-8-ansible-2.9
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
gpgcheck = 0
# https://projects.engineering.redhat.com/browse/RCM-65421
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority

[openstack-16-for-rhel-8-rpms]
name = openstack-16-for-rhel-8-rpms
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/openstack/16.2/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
gpgcheck = 0
# https://projects.engineering.redhat.com/browse/RCM-65421
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority

[rhel-8-codeready-builder-rpms]
name = rhel-8-codeready-builder-rpms
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/x86_64/codeready-builder/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
gpgcheck = 0
# https://projects.engineering.redhat.com/browse/RCM-65421
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[rhel-8-baseos]
name = rhel-8-baseos
baseurl = https://cdn.redhat.com/content/beta/rhel8/8/aarch64/baseos/os/
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/aarch64/baseos/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
Expand All @@ -12,7 +12,7 @@ failovermethod = priority

[rhel-8-appstream]
name = rhel-8-appstream
baseurl = https://cdn.redhat.com/content/beta/rhel8/8/aarch64/appstream/os/
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/aarch64/appstream/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
Expand Down Expand Up @@ -45,16 +45,6 @@ failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-advanced-virt]
name = rhel-8-advanced-virt
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/aarch64/advanced-virt/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-ansible-2.9]
name = rhel-8-ansible-2.9
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/aarch64/ansible/2.9/os/
Expand All @@ -69,7 +59,7 @@ failovermethod = priority

[rhel-8-codeready-builder-rpms]
name = rhel-8-codeready-builder-rpms
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/aarch64/codeready-builder/os/
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/aarch64/codeready-builder/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
Expand Down
37 changes: 3 additions & 34 deletions core-services/release-controller/_repos/ocp-4.12-rhel8.repo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[rhel-8-baseos]
name = rhel-8-baseos
baseurl = https://cdn.redhat.com/content/beta/rhel8/8/x86_64/baseos/os/
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/x86_64/baseos/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
Expand All @@ -12,7 +12,7 @@ failovermethod = priority

[rhel-8-appstream]
name = rhel-8-appstream
baseurl = https://cdn.redhat.com/content/beta/rhel8/8/x86_64/appstream/os/
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/x86_64/appstream/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
Expand All @@ -22,17 +22,6 @@ sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority

[rhel-8-server-ose]
name = rhel-8-server-ose
baseurl = https://mirror2.openshift.com/enterprise/reposync/4.12/rhel-8-server-ose-rpms
sslverify = false
username_file=/tmp/mirror-enterprise-basic-auth/username
password_file=/tmp/mirror-enterprise-basic-auth/password
failovermethod = priority
skip_if_unavailable = true
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-fast-datapath]
name = rhel-8-fast-datapath
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/fast-datapath/os/
Expand All @@ -43,26 +32,6 @@ failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-nfv]
name = rhel-8-nfv
baseurl = https://cdn.redhat.com/content/tus/rhel8/8.4/x86_64/nfv/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-advanced-virt]
name = rhel-8-advanced-virt
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/x86_64/advanced-virt/os/
sslverify = false
sslclientkey = /tmp/key/rh-cdn.pem
sslclientcert = /tmp/key/rh-cdn.pem
failovermethod = priority
gpgcheck = 0
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted

[rhel-8-ansible-2.9]
name = rhel-8-ansible-2.9
baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/os/
Expand All @@ -89,7 +58,7 @@ failovermethod = priority

[rhel-8-codeready-builder-rpms]
name = rhel-8-codeready-builder-rpms
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/x86_64/codeready-builder/os/
baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/x86_64/codeready-builder/os/
enabled = 1
gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted
sslverify = false
Expand Down
Loading