Merge pull request openshift#574 from tmshort/disable-pdb

TRT-2460: Disable upstream PodDisruptionBudget

Author: openshift-merge-bot[bot]

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

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

openshift/helm/catalogd.yaml

@@ -8,6 +8,8 @@ options:
     enabled: true
     deployment:
       image: ${CATALOGD_IMAGE}
+    podDisruptionBudget:
+      enabled: false
   operatorController:
     enabled: false
   openshift:

openshift/helm/operator-controller.yaml

@@ -8,6 +8,8 @@ options:
     enabled: true
     deployment:
       image: ${OPERATOR_CONTROLLER_IMAGE}
+    podDisruptionBudget:
+      enabled: false
   catalogd:
     enabled: false
   openshift:

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

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