OCPBUGS-54790: Move packageserver PDB from guest cluster to management cluster

control-plane-operator/controllers/hostedcontrolplane/v2/assets/packageserver/pdb.yaml

@@ -0,0 +1,9 @@
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: packageserver-pdb
+spec:
+  minAvailable: 1
+  selector:
+    matchLabels:
+      app: packageserver

control-plane-operator/controllers/hostedcontrolplane/v2/cvo/deployment.go

@@ -22,6 +22,7 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	policyv1 "k8s.io/api/policy/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -148,6 +149,7 @@ var (
 		"0000_50_olm_06-psm-operator.deployment.ibm-cloud-managed.yaml",
 		"0000_50_olm_06-psm-operator.service.yaml",
 		"0000_50_olm_06-psm-operator.servicemonitor.yaml",
+		"0000_50_olm_00-packageserver.pdb.yaml",
 		"0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml",
 		"0000_50_olm_07-olm-operator.deployment.yaml",
 		"0000_50_olm_07-collect-profiles.cronjob.yaml",
@@ -266,13 +268,15 @@ func resourcesToRemove(platformType hyperv1.PlatformType) []client.Object {
 	switch platformType {
 	case hyperv1.IBMCloudPlatform, hyperv1.PowerVSPlatform:
 		return []client.Object{
+			&policyv1.PodDisruptionBudget{ObjectMeta: metav1.ObjectMeta{Name: "packageserver-pdb", Namespace: "openshift-operator-lifecycle-manager"}},
 			&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "network-operator", Namespace: "openshift-network-operator"}},
 			&rbacv1.ClusterRoleBinding{ObjectMeta: metav1.ObjectMeta{Name: "default-account-cluster-network-operator"}},
 			&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "cluster-node-tuning-operator", Namespace: "openshift-cluster-node-tuning-operator"}},
 			&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "cluster-image-registry-operator", Namespace: "openshift-image-registry"}},
 		}
 	default:
 		return []client.Object{
+			&policyv1.PodDisruptionBudget{ObjectMeta: metav1.ObjectMeta{Name: "packageserver-pdb", Namespace: "openshift-operator-lifecycle-manager"}},
 			&apiextensionsv1.CustomResourceDefinition{ObjectMeta: metav1.ObjectMeta{Name: "machineconfigs.machineconfiguration.openshift.io"}},
 			&apiextensionsv1.CustomResourceDefinition{ObjectMeta: metav1.ObjectMeta{Name: "machineconfigpools.machineconfiguration.openshift.io"}},
 			&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "network-operator", Namespace: "openshift-network-operator"}},

control-plane-operator/controllers/hostedcontrolplane/v2/cvo/deployment_test.go

@@ -110,6 +110,15 @@ func TestPreparePayloadScript(t *testing.T) {
 				g.Expect(script).To(ContainSubstring("0000_01_cleanup.yaml"))
 			},
 		},
+		{
+			name:         "When called, it should omit the packageserver PDB manifest from the payload",
+			platformType: hyperv1.AWSPlatform,
+			oauthEnabled: true,
+			featureSet:   configv1.Default,
+			assertions: func(g Gomega, script string) {
+				g.Expect(script).To(ContainSubstring("rm -f /var/payload/release-manifests/0000_50_olm_00-packageserver.pdb.yaml"))
+			},
+		},
 	}
 
 	for _, tt := range tests {
@@ -135,6 +144,7 @@ func TestResourcesToRemove(t *testing.T) {
 			name:         "When platform is IBMCloud, it should return IBM-specific resources without CRDs",
 			platformType: hyperv1.IBMCloudPlatform,
 			assertions: func(g Gomega, resources []string) {
+				g.Expect(resources).To(ContainElement("packageserver-pdb"))
 				g.Expect(resources).To(ContainElement("network-operator"))
 				g.Expect(resources).To(ContainElement("default-account-cluster-network-operator"))
 				g.Expect(resources).To(ContainElement("cluster-node-tuning-operator"))
@@ -158,6 +168,7 @@ func TestResourcesToRemove(t *testing.T) {
 			name:         "When platform is AWS (default), it should return the full list including CRDs and storage operators",
 			platformType: hyperv1.AWSPlatform,
 			assertions: func(g Gomega, resources []string) {
+				g.Expect(resources).To(ContainElement("packageserver-pdb"))
 				g.Expect(resources).To(ContainElement("machineconfigs.machineconfiguration.openshift.io"))
 				g.Expect(resources).To(ContainElement("machineconfigpools.machineconfiguration.openshift.io"))
 				g.Expect(resources).To(ContainElement("network-operator"))

control-plane-operator/controllers/hostedcontrolplane/v2/olm/packageserver/component.go

@@ -33,6 +33,10 @@ func (r *packageServer) NeedsManagementKASAccess() bool {
 func NewComponent() component.ControlPlaneComponent {
 	return component.NewDeploymentComponent(ComponentName, &packageServer{}).
 		WithAdaptFunction(adaptDeployment).
+		WithManifestAdapter(
+			"pdb.yaml",
+			component.AdaptPodDisruptionBudget(),
+		).
 		InjectKonnectivityContainer(component.KonnectivityContainerOptions{
 			Mode: component.Socks5,
 		}).

control-plane-operator/controllers/hostedcontrolplane/v2/olm/packageserver/component_test.go

@@ -0,0 +1,16 @@
+package packageserver
+
+import (
+	"testing"
+
+	. "github.com/onsi/gomega"
+)
+
+func TestNewComponent(t *testing.T) {
+	t.Parallel()
+	g := NewWithT(t)
+
+	component := NewComponent()
+	g.Expect(component).ToNot(BeNil())
+	g.Expect(component.Name()).To(Equal("packageserver"))
+}