From 9837d8dd45ad5f7e768b80dd854aff30331e6486 Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Mon, 7 Apr 2025 14:51:37 +0200 Subject: [PATCH] core-services/release-controller/repos: Update 4.20 repos to rhel 10 Remove the Y stream from repo definitions Signed-off-by: jbtrystram --- .../release-controller/rpms-ocp-4.19.yaml | 94 ------------------- .../release-controller/rpms-ocp-4.20.yaml | 16 ++-- .../release-controller/rpms-ocp-4.19.yaml | 94 ------------------- .../release-controller/rpms-ocp-4.20.yaml | 16 ++-- .../_repos/ocp-4.19-rhel100.repo | 88 ----------------- ...4.20-rhel100.repo => ocp-4.20-rhel10.repo} | 46 ++++----- 6 files changed, 39 insertions(+), 315 deletions(-) delete mode 100644 core-services/release-controller/_repos/ocp-4.19-rhel100.repo rename core-services/release-controller/_repos/{ocp-4.20-rhel100.repo => ocp-4.20-rhel10.repo} (83%) diff --git a/clusters/build-clusters/common/release-controller/rpms-ocp-4.19.yaml b/clusters/build-clusters/common/release-controller/rpms-ocp-4.19.yaml index ea6091634a92b..25bca016b2b73 100644 --- a/clusters/build-clusters/common/release-controller/rpms-ocp-4.19.yaml +++ b/clusters/build-clusters/common/release-controller/rpms-ocp-4.19.yaml @@ -760,100 +760,6 @@ spec: # art_rpm_mirroring_services.py added the following resource #--------------------------------------------------------------------------------- -apiVersion: v1 -kind: Service -metadata: - name: base-4-19-rhel100 - namespace: ocp -spec: - ports: - - port: 80 - targetPort: 8080 - selector: - app: base-4-19-rhel100 - 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-19-rhel100 - name: base-4-19-rhel100 - namespace: ocp -spec: - replicas: 2 - selector: - matchLabels: - app: base-4-19-rhel100 - template: - metadata: - annotations: - cluster-autoscaler.kubernetes.io/safe-to-evict: 'true' - labels: - app: base-4-19-rhel100 - spec: - containers: - - command: - - content-mirror - - --path=/tmp/config - - --max-size=5g - - --timeout=30m - - /tmp/repos - - /tmp/key - - /tmp/mirror-enterprise-basic-auth - image: ' ' - 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.19-rhel100.repo - path: ocp-4.19-rhel100.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/clusters/build-clusters/common/release-controller/rpms-ocp-4.20.yaml b/clusters/build-clusters/common/release-controller/rpms-ocp-4.20.yaml index 21f126cebc9c6..6f4990d4d789a 100644 --- a/clusters/build-clusters/common/release-controller/rpms-ocp-4.20.yaml +++ b/clusters/build-clusters/common/release-controller/rpms-ocp-4.20.yaml @@ -763,14 +763,14 @@ spec: apiVersion: v1 kind: Service metadata: - name: base-4-20-rhel100 + name: base-4-20-rhel10 namespace: ocp spec: ports: - port: 80 targetPort: 8080 selector: - app: base-4-20-rhel100 + app: base-4-20-rhel10 type: ClusterIP --- #--------------------------------------------------------------------------------- @@ -783,20 +783,20 @@ 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-20-rhel100 - name: base-4-20-rhel100 + app: base-4-20-rhel10 + name: base-4-20-rhel10 namespace: ocp spec: replicas: 2 selector: matchLabels: - app: base-4-20-rhel100 + app: base-4-20-rhel10 template: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: 'true' labels: - app: base-4-20-rhel100 + app: base-4-20-rhel10 spec: containers: - command: @@ -834,8 +834,8 @@ spec: volumes: - configMap: items: - - key: ocp-4.20-rhel100.repo - path: ocp-4.20-rhel100.repo + - key: ocp-4.20-rhel10.repo + path: ocp-4.20-rhel10.repo name: base-repos name: repos - name: key diff --git a/clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.19.yaml b/clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.19.yaml index ea6091634a92b..25bca016b2b73 100644 --- a/clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.19.yaml +++ b/clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.19.yaml @@ -760,100 +760,6 @@ spec: # art_rpm_mirroring_services.py added the following resource #--------------------------------------------------------------------------------- -apiVersion: v1 -kind: Service -metadata: - name: base-4-19-rhel100 - namespace: ocp -spec: - ports: - - port: 80 - targetPort: 8080 - selector: - app: base-4-19-rhel100 - 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-19-rhel100 - name: base-4-19-rhel100 - namespace: ocp -spec: - replicas: 2 - selector: - matchLabels: - app: base-4-19-rhel100 - template: - metadata: - annotations: - cluster-autoscaler.kubernetes.io/safe-to-evict: 'true' - labels: - app: base-4-19-rhel100 - spec: - containers: - - command: - - content-mirror - - --path=/tmp/config - - --max-size=5g - - --timeout=30m - - /tmp/repos - - /tmp/key - - /tmp/mirror-enterprise-basic-auth - image: ' ' - 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.19-rhel100.repo - path: ocp-4.19-rhel100.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/clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.20.yaml b/clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.20.yaml index 21f126cebc9c6..6f4990d4d789a 100644 --- a/clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.20.yaml +++ b/clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.20.yaml @@ -763,14 +763,14 @@ spec: apiVersion: v1 kind: Service metadata: - name: base-4-20-rhel100 + name: base-4-20-rhel10 namespace: ocp spec: ports: - port: 80 targetPort: 8080 selector: - app: base-4-20-rhel100 + app: base-4-20-rhel10 type: ClusterIP --- #--------------------------------------------------------------------------------- @@ -783,20 +783,20 @@ 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-20-rhel100 - name: base-4-20-rhel100 + app: base-4-20-rhel10 + name: base-4-20-rhel10 namespace: ocp spec: replicas: 2 selector: matchLabels: - app: base-4-20-rhel100 + app: base-4-20-rhel10 template: metadata: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: 'true' labels: - app: base-4-20-rhel100 + app: base-4-20-rhel10 spec: containers: - command: @@ -834,8 +834,8 @@ spec: volumes: - configMap: items: - - key: ocp-4.20-rhel100.repo - path: ocp-4.20-rhel100.repo + - key: ocp-4.20-rhel10.repo + path: ocp-4.20-rhel10.repo name: base-repos name: repos - name: key diff --git a/core-services/release-controller/_repos/ocp-4.19-rhel100.repo b/core-services/release-controller/_repos/ocp-4.19-rhel100.repo deleted file mode 100644 index b92e2475b6e4c..0000000000000 --- a/core-services/release-controller/_repos/ocp-4.19-rhel100.repo +++ /dev/null @@ -1,88 +0,0 @@ -[rhel-10.0-baseos] -name = rhel-10.0-baseos -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.19/rhel-100-baseos -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-10.0-appstream] -name = rhel-10.0-appstream -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.19/rhel-100-appstream -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-10.0-fast-datapath] -name = rhel-10.0-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-10.0-nfv] -name = rhel-10.0-nfv -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.19/rhel-100-nfv -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-10.0-highavailability] -name = rhel-10.0-highavailability -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.19/rhel-100-highavailability -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-10.0-server-ose-4.19] -name = rhel-10.0-server-ose-4.19 -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.19/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 - -# Yes, this is the same repo as the 4.19 plashet above but with an includepkgs. -# See https://issues.redhat.com/browse/ART-11248. -[rhel-10.0-early-kernel] -name = rhel-10.0-early-kernel -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.19/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 -# For ose-aws-ecr-image-credential-provider, see -# https://issues.redhat.com/browse/RHEL-82921 -includepkgs=kernel,kernel-*,ose-aws-ecr-image-credential-provider diff --git a/core-services/release-controller/_repos/ocp-4.20-rhel100.repo b/core-services/release-controller/_repos/ocp-4.20-rhel10.repo similarity index 83% rename from core-services/release-controller/_repos/ocp-4.20-rhel100.repo rename to core-services/release-controller/_repos/ocp-4.20-rhel10.repo index 568647b55660c..00a64217fe9bd 100644 --- a/core-services/release-controller/_repos/ocp-4.20-rhel100.repo +++ b/core-services/release-controller/_repos/ocp-4.20-rhel10.repo @@ -1,6 +1,6 @@ -[rhel-10.0-baseos] -name = rhel-10.0-baseos -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-100-baseos +[rhel-10-baseos] +name = rhel-10-baseos +baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-10-baseos 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 @@ -10,9 +10,9 @@ password_file = /tmp/mirror-enterprise-basic-auth/password failovermethod = priority skip_if_unavailable = true -[rhel-10.0-appstream] -name = rhel-10.0-appstream -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-100-appstream +[rhel-10-appstream] +name = rhel-10-appstream +baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-10-appstream 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 @@ -22,9 +22,9 @@ password_file = /tmp/mirror-enterprise-basic-auth/password failovermethod = priority skip_if_unavailable = true -[rhel-10.0-fast-datapath] -name = rhel-10.0-fast-datapath -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/fast-datapath/os/ +[rhel-10-fast-datapath] +name = rhel-10-fast-datapath +baseurl = https://cdn.redhat.com/content/dist/layered/rhel10/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 @@ -34,9 +34,9 @@ sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -[rhel-10.0-nfv] -name = rhel-10.0-nfv -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-100-nfv +[rhel-10-nfv] +name = rhel-10-nfv +baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-10-nfv 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 @@ -46,9 +46,9 @@ password_file = /tmp/mirror-enterprise-basic-auth/password failovermethod = priority skip_if_unavailable = true -[rhel-10.0-highavailability] -name = rhel-10.0-highavailability -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-100-highavailability +[rhel-10-highavailability] +name = rhel-10-highavailability +baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-10-highavailability 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 @@ -58,9 +58,9 @@ password_file = /tmp/mirror-enterprise-basic-auth/password failovermethod = priority skip_if_unavailable = true -[rhel-10.0-server-ose-4.20] -name = rhel-10.0-server-ose-4.20 -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-9-server-ose-rpms +[rhel-10-server-ose-4.20] +name = rhel-10-server-ose-4.20 +baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-10-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 @@ -70,11 +70,11 @@ password_file = /tmp/mirror-enterprise-basic-auth/password failovermethod = priority skip_if_unavailable = true -# Yes, this is the same repo as the 4.19 plashet above but with an includepkgs. +# Yes, this is the same repo as the 4.20 plashet above but with an includepkgs. # See https://issues.redhat.com/browse/ART-11248. -[rhel-10.0-early-kernel] -name = rhel-10.0-early-kernel -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-9-server-ose-rpms +[rhel-10-early-kernel] +name = rhel-10-early-kernel +baseurl = https://mirror2.openshift.com/enterprise/reposync/4.20/rhel-10-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 @@ -85,4 +85,4 @@ failovermethod = priority skip_if_unavailable = true # For ose-aws-ecr-image-credential-provider, see # https://issues.redhat.com/browse/RHEL-82921 -includepkgs = kernel,kernel-*,ose-aws-ecr-image-credential-provider +includepkgs=kernel,kernel-*,ose-aws-ecr-image-credential-provider