Skip to content

Commit 2ba738a

Browse files
committed
Revert "Merge pull request openshift#574 from tmshort/disable-pdb"
This reverts commit cbbc65c, reversing changes made to 24cf078.
1 parent cbbc65c commit 2ba738a

File tree

6 files changed

+68
-4
lines changed

6 files changed

+68
-4
lines changed

openshift/catalogd/manifests-experimental.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,23 @@ spec:
6565
- Ingress
6666
- Egress
6767
---
68+
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml
69+
apiVersion: policy/v1
70+
kind: PodDisruptionBudget
71+
metadata:
72+
name: catalogd-controller-manager
73+
namespace: openshift-catalogd
74+
labels:
75+
app.kubernetes.io/name: catalogd
76+
app.kubernetes.io/part-of: olm
77+
annotations:
78+
olm.operatorframework.io/feature-set: experimental
79+
spec:
80+
minAvailable: 1
81+
selector:
82+
matchLabels:
83+
control-plane: catalogd-controller-manager
84+
---
6885
# Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml
6986
apiVersion: v1
7087
kind: ServiceAccount

openshift/catalogd/manifests.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,23 @@ spec:
6565
- Ingress
6666
- Egress
6767
---
68+
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml
69+
apiVersion: policy/v1
70+
kind: PodDisruptionBudget
71+
metadata:
72+
name: catalogd-controller-manager
73+
namespace: openshift-catalogd
74+
labels:
75+
app.kubernetes.io/name: catalogd
76+
app.kubernetes.io/part-of: olm
77+
annotations:
78+
olm.operatorframework.io/feature-set: standard
79+
spec:
80+
minAvailable: 1
81+
selector:
82+
matchLabels:
83+
control-plane: catalogd-controller-manager
84+
---
6885
# Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml
6986
apiVersion: v1
7087
kind: ServiceAccount

openshift/helm/catalogd.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ options:
88
enabled: true
99
deployment:
1010
image: ${CATALOGD_IMAGE}
11-
podDisruptionBudget:
12-
enabled: false
1311
operatorController:
1412
enabled: false
1513
openshift:

openshift/helm/operator-controller.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ options:
88
enabled: true
99
deployment:
1010
image: ${OPERATOR_CONTROLLER_IMAGE}
11-
podDisruptionBudget:
12-
enabled: false
1311
catalogd:
1412
enabled: false
1513
openshift:

openshift/operator-controller/manifests-experimental.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,23 @@ spec:
6161
- Ingress
6262
- Egress
6363
---
64+
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml
65+
apiVersion: policy/v1
66+
kind: PodDisruptionBudget
67+
metadata:
68+
name: operator-controller-controller-manager
69+
namespace: openshift-operator-controller
70+
labels:
71+
app.kubernetes.io/name: operator-controller
72+
app.kubernetes.io/part-of: olm
73+
annotations:
74+
olm.operatorframework.io/feature-set: experimental
75+
spec:
76+
minAvailable: 1
77+
selector:
78+
matchLabels:
79+
control-plane: operator-controller-controller-manager
80+
---
6481
# Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml
6582
apiVersion: v1
6683
kind: ServiceAccount

openshift/operator-controller/manifests.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,23 @@ spec:
6161
- Ingress
6262
- Egress
6363
---
64+
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml
65+
apiVersion: policy/v1
66+
kind: PodDisruptionBudget
67+
metadata:
68+
name: operator-controller-controller-manager
69+
namespace: openshift-operator-controller
70+
labels:
71+
app.kubernetes.io/name: operator-controller
72+
app.kubernetes.io/part-of: olm
73+
annotations:
74+
olm.operatorframework.io/feature-set: standard
75+
spec:
76+
minAvailable: 1
77+
selector:
78+
matchLabels:
79+
control-plane: operator-controller-controller-manager
80+
---
6481
# Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml
6582
apiVersion: v1
6683
kind: ServiceAccount

0 commit comments

Comments
 (0)