core-services/release-controller/repos: Update 4.20 repos to rhel 10 (openshift#63561)

jbtrystram · web-flow · commit 6fa4ed425285 · 2025-04-28T15:29:49.000Z
Remove the Y stream from repo definitions

Signed-off-by: jbtrystram &lt;jbtrystram@redhat.com&gt;
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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/core-services/release-controller/_repos/ocp-4.20-rhel10.repo b/core-services/release-controller/_repos/ocp-4.20-rhel10.repo
