Skip to content

core-services/release-controller/repos: Update 4.20 to rhel 10.1 #63561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 28, 2025
Merged

core-services/release-controller/repos: Update 4.20 to rhel 10.1 #63561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
94 changes: 0 additions & 94 deletions clusters/build-clusters/common/release-controller/rpms-ocp-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions clusters/build-clusters/common/release-controller/rpms-ocp-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
#---------------------------------------------------------------------------------
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
94 changes: 0 additions & 94 deletions clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions clusters/build-clusters/vsphere02/release-controller/rpms-ocp-4.20.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---
#---------------------------------------------------------------------------------
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
88 changes: 0 additions & 88 deletions core-services/release-controller/_repos/ocp-4.19-rhel100.repo
View file
Open in desktop

This file was deleted.

Loading