From a228eaa2377ad533bd5422caa951fbda6374aa5f Mon Sep 17 00:00:00 2001 From: Joep van Delft Date: Wed, 9 Apr 2025 12:43:17 +0200 Subject: [PATCH] Libreswan adjustments This change aims to do two things: - Start listening for changs when libreswan sees an update This can happen now libreswan is not pinned anymore - Get an annotation in the consistency checks if rhcos and ovn have different versions for libreswan. ovn-miicroshift is not yet needed --- group.yml | 2 ++ images/ose-ovn-kubernetes.yml | 1 - images/ovn-kubernetes-base.yml | 1 - images/ovn-kubernetes-microshift.yml | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/group.yml b/group.yml index 599eb6768d..f96b96de57 100644 --- a/group.yml +++ b/group.yml @@ -92,6 +92,8 @@ rhcos: require_consistency: driver-toolkit: - kernel # since 9.3, kernel-rt is merged into the kernel package. + ose-ovn-kubernetes: + - libreswan allow_missing_brew_rpms: false check_external_packages: diff --git a/images/ose-ovn-kubernetes.yml b/images/ose-ovn-kubernetes.yml index 35a75ae0de..b0996533fa 100644 --- a/images/ose-ovn-kubernetes.yml +++ b/images/ose-ovn-kubernetes.yml @@ -31,7 +31,6 @@ scan_sources: # We should configure exemptions for those known pins to avoid meaningless rebuild. # https://github.com/openshift/ovn-kubernetes/blob/e236fea83d62de8b60b9456770a3e0b525830051/Dockerfile.base#L22 exempt_rpms: - - libreswan - openvswitch* - ovn* - python3-openvswitch* diff --git a/images/ovn-kubernetes-base.yml b/images/ovn-kubernetes-base.yml index 187c2b3b68..79c62759c7 100644 --- a/images/ovn-kubernetes-base.yml +++ b/images/ovn-kubernetes-base.yml @@ -28,7 +28,6 @@ scan_sources: # We should configure exemptions for those known pins to avoid meaningless rebuild. # https://github.com/openshift/ovn-kubernetes/blob/e236fea83d62de8b60b9456770a3e0b525830051/Dockerfile.base#L22 exempt_rpms: - - libreswan - openvswitch* - ovn* - python3-openvswitch* diff --git a/images/ovn-kubernetes-microshift.yml b/images/ovn-kubernetes-microshift.yml index ea0962f919..dad81fd011 100644 --- a/images/ovn-kubernetes-microshift.yml +++ b/images/ovn-kubernetes-microshift.yml @@ -31,7 +31,6 @@ scan_sources: # We should configure exemptions for those known pins to avoid meaningless rebuild. # https://github.com/openshift/ovn-kubernetes/blob/e236fea83d62de8b60b9456770a3e0b525830051/Dockerfile.base#L22 exempt_rpms: - - libreswan - openvswitch* - ovn* - python3-openvswitch*