diff --git a/openshift/catalogd/manifests-experimental.yaml b/openshift/catalogd/manifests-experimental.yaml index 06bd2abd8..4dacdee86 100644 --- a/openshift/catalogd/manifests-experimental.yaml +++ b/openshift/catalogd/manifests-experimental.yaml @@ -65,23 +65,6 @@ spec: - Ingress - Egress --- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: catalogd-controller-manager - namespace: openshift-catalogd - labels: - app.kubernetes.io/name: catalogd - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: experimental -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: catalogd-controller-manager ---- # Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml apiVersion: v1 kind: ServiceAccount diff --git a/openshift/catalogd/manifests.yaml b/openshift/catalogd/manifests.yaml index e197256bf..68b6c87f3 100644 --- a/openshift/catalogd/manifests.yaml +++ b/openshift/catalogd/manifests.yaml @@ -65,23 +65,6 @@ spec: - Ingress - Egress --- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: catalogd-controller-manager - namespace: openshift-catalogd - labels: - app.kubernetes.io/name: catalogd - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: standard -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: catalogd-controller-manager ---- # Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml apiVersion: v1 kind: ServiceAccount diff --git a/openshift/helm/catalogd.yaml b/openshift/helm/catalogd.yaml index 8eeae6e12..1e321bb52 100644 --- a/openshift/helm/catalogd.yaml +++ b/openshift/helm/catalogd.yaml @@ -8,6 +8,8 @@ options: enabled: true deployment: image: ${CATALOGD_IMAGE} + podDisruptionBudget: + enabled: false operatorController: enabled: false openshift: diff --git a/openshift/helm/operator-controller.yaml b/openshift/helm/operator-controller.yaml index ff48c8fd1..ee6276a25 100644 --- a/openshift/helm/operator-controller.yaml +++ b/openshift/helm/operator-controller.yaml @@ -8,6 +8,8 @@ options: enabled: true deployment: image: ${OPERATOR_CONTROLLER_IMAGE} + podDisruptionBudget: + enabled: false catalogd: enabled: false openshift: diff --git a/openshift/operator-controller/manifests-experimental.yaml b/openshift/operator-controller/manifests-experimental.yaml index e8893063e..6ecb52ff2 100644 --- a/openshift/operator-controller/manifests-experimental.yaml +++ b/openshift/operator-controller/manifests-experimental.yaml @@ -61,23 +61,6 @@ spec: - Ingress - Egress --- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: operator-controller-controller-manager - namespace: openshift-operator-controller - labels: - app.kubernetes.io/name: operator-controller - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: experimental -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: operator-controller-controller-manager ---- # Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml apiVersion: v1 kind: ServiceAccount diff --git a/openshift/operator-controller/manifests.yaml b/openshift/operator-controller/manifests.yaml index 8d2be5ecf..091dfe26a 100644 --- a/openshift/operator-controller/manifests.yaml +++ b/openshift/operator-controller/manifests.yaml @@ -61,23 +61,6 @@ spec: - Ingress - Egress --- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: operator-controller-controller-manager - namespace: openshift-operator-controller - labels: - app.kubernetes.io/name: operator-controller - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: standard -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: operator-controller-controller-manager ---- # Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml apiVersion: v1 kind: ServiceAccount