Skip to content

Commit 0ab1749

Browse files
committed
ovn-kubernetes: Remove exemptions for now unpinned OVN rpms.
ovn* RPMs are no longer pinned in ovn-kubernetes images in order to facilitate timely CVE and bug fix delivery. Remove from exemptions. Signed-off-by: Ilya Maximets <[email protected]>
1 parent 1697b88 commit 0ab1749

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

images/ose-ovn-kubernetes.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,10 @@ enabled_repos:
2929
- rhel-9-appstream-rpms
3030
- rhel-9-fast-datapath-rpms
3131
- rhel-9-server-ose-rpms-embargoed
32-
# Generally doozer scan-sources will detect all possible change factors automatically and trigger rebuilds.
33-
# However, certain images may consume RPMs in unexpected way that make it programmatically impossible to
34-
# detect they were used.
3532
konflux:
3633
cachi2:
3734
lockfile:
3835
inspect_parent: false
39-
scan_sources:
40-
# ovn-kubernetes uses pins in the Dockerfile.
41-
# We should configure exemptions for those known pins to avoid meaningless rebuild.
42-
# https://github.com/openshift/ovn-kubernetes/blob/e236fea83d62de8b60b9456770a3e0b525830051/Dockerfile.base#L22
43-
exempt_rpms:
44-
- ovn*
4536
for_payload: true
4637
from:
4738
builder:

images/ovn-kubernetes-base.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ enabled_repos:
2020
- rhel-9-baseos-rpms
2121
- rhel-9-fast-datapath-rpms
2222
- rhel-9-server-ose-rpms-embargoed
23-
# Generally doozer scan-sources will detect all possible change factors automatically and trigger rebuilds.
24-
# However, certain images may consume RPMs in unexpected way that make it programmatically impossible to
25-
# detect they were used.
26-
scan_sources:
27-
# ovn-kubernetes uses pins in the Dockerfile.
28-
# We should configure exemptions for those known pins to avoid meaningless rebuild.
29-
# https://github.com/openshift/ovn-kubernetes/blob/e236fea83d62de8b60b9456770a3e0b525830051/Dockerfile.base#L22
30-
exempt_rpms:
31-
- ovn*
3223
for_payload: false
3324
for_release: false
3425
from:

images/ovn-kubernetes-microshift.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,8 @@ distgit:
2222
delivery:
2323
# Maps to honeybadger repo_name
2424
repo_name: ose-ovn-kubernetes-microshift
25-
# Generally doozer scan-sources will detect all possible change factors automatically and trigger rebuilds.
26-
# However, certain images may consume RPMs in unexpected way that make it programmatically impossible to
27-
# detect they were used.
2825
delivery_repo_names:
2926
- openshift4/ose-ovn-kubernetes-microshift-rhel9
30-
scan_sources:
31-
# ovn-kubernetes uses pins in the Dockerfile.
32-
# We should configure exemptions for those known pins to avoid meaningless rebuild.
33-
# https://github.com/openshift/ovn-kubernetes/blob/e236fea83d62de8b60b9456770a3e0b525830051/Dockerfile.base#L22
34-
exempt_rpms:
35-
- ovn*
3627
for_payload: true
3728
from:
3829
builder:

0 commit comments

Comments
 (0)