From 96bf609f3e4ade96fd65b73f0172623d84f48983 Mon Sep 17 00:00:00 2001 From: Dhruv Gautam Date: Mon, 11 May 2026 16:25:54 +0530 Subject: [PATCH] OCPBUGS-54790: Fix packageserver PDB annotation for HyperShift Replace include.release.openshift.io/hypershift annotation with exclude.release.openshift.io/ibm-cloud-managed on the packageserver PDB so it is no longer deployed to HyperShift data planes where packageserver pods do not run. Co-Authored-By: Claude Opus 4.6 --- manifests/0000_50_olm_00-packageserver.pdb.yaml | 2 -- microshift-manifests/0000_50_olm_00-packageserver.pdb.yaml | 2 -- scripts/generate_crds_manifests.sh | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/0000_50_olm_00-packageserver.pdb.yaml b/manifests/0000_50_olm_00-packageserver.pdb.yaml index 78dba821e2..005ff8b9ff 100644 --- a/manifests/0000_50_olm_00-packageserver.pdb.yaml +++ b/manifests/0000_50_olm_00-packageserver.pdb.yaml @@ -4,10 +4,8 @@ metadata: name: packageserver-pdb namespace: openshift-operator-lifecycle-manager annotations: - include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" - include.release.openshift.io/hypershift: "true" spec: maxUnavailable: 1 selector: diff --git a/microshift-manifests/0000_50_olm_00-packageserver.pdb.yaml b/microshift-manifests/0000_50_olm_00-packageserver.pdb.yaml index 78dba821e2..005ff8b9ff 100644 --- a/microshift-manifests/0000_50_olm_00-packageserver.pdb.yaml +++ b/microshift-manifests/0000_50_olm_00-packageserver.pdb.yaml @@ -4,10 +4,8 @@ metadata: name: packageserver-pdb namespace: openshift-operator-lifecycle-manager annotations: - include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" - include.release.openshift.io/hypershift: "true" spec: maxUnavailable: 1 selector: diff --git a/scripts/generate_crds_manifests.sh b/scripts/generate_crds_manifests.sh index 85805439d7..b824e315c2 100755 --- a/scripts/generate_crds_manifests.sh +++ b/scripts/generate_crds_manifests.sh @@ -561,6 +561,9 @@ for f in $(find "${hypershift_manifests_dir}" -type f -name "*.yaml"); do fi done +${YQ} d -d'*' --inplace manifests/0000_50_olm_00-packageserver.pdb.yaml 'metadata.annotations[include.release.openshift.io/ibm-cloud-managed]' +${YQ} d -d'*' --inplace manifests/0000_50_olm_00-packageserver.pdb.yaml 'metadata.annotations[include.release.openshift.io/hypershift]' + find "${ROOT_DIR}/manifests" -type f -exec $SED -i "/^#/d" {} \; find "${ROOT_DIR}/manifests" -type f -exec $SED -i "1{/---/d}" {} \;