Skip to content
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

Jump to bottom

repos: 4.16: Use RHEL 9.4 EUS repos for RHCOS #51750

Merged
merged 2 commits into from
May 7, 2024
Merged

repos: 4.16: Use RHEL 9.4 EUS repos for RHCOS #51750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae88a82
repos: 4.16: Use RHEL 9.4 EUS repos for RHCOS
travier May 7, 2024
d536a8b
repos: 4.16: Remove now unused RHEL 9.2 repos
travier May 7, 2024
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
98 changes: 0 additions & 98 deletions clusters/build-clusters/common/release-controller/rpms-ocp-4.16.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
71 changes: 0 additions & 71 deletions core-services/release-controller/_repos/ocp-4.16-rhel92.repo
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions core-services/release-controller/_repos/ocp-4.16-rhel94.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what e4s is, but it differs from the eus above... hence this comment.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The NFV repos are in a different place as they have a different lifecycle. See for RHEL 9.2: https://github.com/openshift/release/blob/master/core-services/release-controller/_repos/ocp-4.15-rhel92.repo#L39

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some hints in https://access.redhat.com/articles/3751271

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That explains it, thanks.
/lgtm

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