From a2f84673cbc0286b09433935718c0cfa5c4ef0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Tue, 7 May 2024 18:07:11 +0200 Subject: [PATCH] repos: 4.16: Use RHEL 9.4 EUS repos for RHCOS (#51750) * repos: 4.16: Use RHEL 9.4 EUS repos for RHCOS * repos: 4.16: Remove now unused RHEL 9.2 repos --- .../release-controller/rpms-ocp-4.16.yaml | 98 ------------------- .../_repos/ocp-4.16-rhel92.repo | 71 -------------- .../_repos/ocp-4.16-rhel94.repo | 6 +- 3 files changed, 3 insertions(+), 172 deletions(-) delete mode 100644 core-services/release-controller/_repos/ocp-4.16-rhel92.repo diff --git a/clusters/build-clusters/common/release-controller/rpms-ocp-4.16.yaml b/clusters/build-clusters/common/release-controller/rpms-ocp-4.16.yaml index 32ecd7e760ec..8429998fb051 100644 --- a/clusters/build-clusters/common/release-controller/rpms-ocp-4.16.yaml +++ b/clusters/build-clusters/common/release-controller/rpms-ocp-4.16.yaml @@ -1184,104 +1184,6 @@ spec: # art_rpm_mirroring_services.py added the following resource #--------------------------------------------------------------------------------- -apiVersion: v1 -kind: Service -metadata: - name: base-4-16-rhel92 - namespace: ocp -spec: - ports: - - port: 80 - targetPort: 8080 - selector: - app: base-4-16-rhel92 - 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-16-rhel92 - name: base-4-16-rhel92 - namespace: ocp -spec: - replicas: 2 - selector: - matchLabels: - app: base-4-16-rhel92 - template: - metadata: - annotations: - cluster-autoscaler.kubernetes.io/safe-to-evict: 'true' - labels: - app: base-4-16-rhel92 - spec: - containers: - - command: - - content-mirror - - --path=/tmp/config - - --max-size=5g - - --timeout=30m - - /tmp/repos - image: ' ' - livenessProbe: - httpGet: - path: /rhel-9.2-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 - nodeSelector: - kubernetes.io/arch: amd64 - kubernetes.io/os: linux - volumes: - - configMap: - items: - - key: ocp-4.16-rhel92.repo - path: ocp-4.16-rhel92.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: diff --git a/core-services/release-controller/_repos/ocp-4.16-rhel92.repo b/core-services/release-controller/_repos/ocp-4.16-rhel92.repo deleted file mode 100644 index 351ced8251a7..000000000000 --- a/core-services/release-controller/_repos/ocp-4.16-rhel92.repo +++ /dev/null @@ -1,71 +0,0 @@ -[rhel-9.2-baseos] -name = rhel-9.2-baseos -baseurl = https://cdn.redhat.com/content/eus/rhel9/9.2/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 -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-9.2-appstream] -name = rhel-9.2-appstream -baseurl = https://cdn.redhat.com/content/eus/rhel9/9.2/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 -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-9.2-fast-datapath] -name = rhel-9.2-fast-datapath -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/fast-datapath/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-9.2-nfv] -name = rhel-9.2-nfv -baseurl = https://cdn.redhat.com/content/e4s/rhel9/9.2/x86_64/nfv/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-9.2-server-ose-4.16] -name = rhel-9.2-server-ose-4.16 -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.16/rhel-9-server-ose-rpms -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 -username_file = /tmp/mirror-enterprise-basic-auth/username -password_file = /tmp/mirror-enterprise-basic-auth/password -failovermethod = priority -skip_if_unavailable = true - -[rhel-92-codeready-builder-rpms] -name = rhel-92-codeready-builder-rpms -baseurl = https://cdn.redhat.com/content/eus/rhel9/9.2/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 diff --git a/core-services/release-controller/_repos/ocp-4.16-rhel94.repo b/core-services/release-controller/_repos/ocp-4.16-rhel94.repo index 8aedce7f0c05..29c46eea895d 100644 --- a/core-services/release-controller/_repos/ocp-4.16-rhel94.repo +++ b/core-services/release-controller/_repos/ocp-4.16-rhel94.repo @@ -1,6 +1,6 @@ [rhel-9.4-baseos] name = rhel-9.4-baseos -baseurl = https://cdn.redhat.com/content/beta/rhel9/9/x86_64/baseos/os +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.4/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 @@ -12,7 +12,7 @@ failovermethod = priority [rhel-9.4-appstream] name = rhel-9.4-appstream -baseurl = https://cdn.redhat.com/content/beta/rhel9/9/x86_64/appstream/os +baseurl = https://cdn.redhat.com/content/eus/rhel9/9.4/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 @@ -36,7 +36,7 @@ failovermethod = priority [rhel-9.4-nfv] name = rhel-9.4-nfv -baseurl = https://cdn.redhat.com/content/beta/rhel9/9/x86_64/nfv/os +baseurl = https://cdn.redhat.com/content/e4s/rhel9/9.4/x86_64/nfv/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