Skip to content

Commit 06aaa45

Browse files
committed
Revert "add PDB to make sure at least 1 pod is always available during upgrade (#2362)"
This is causing an issue with multi-node upgrades downstream. This reverts commit 5ed8cf4.
1 parent 4e349e6 commit 06aaa45

File tree

8 files changed

+1
-190
lines changed

8 files changed

+1
-190
lines changed

hack/test/install-prometheus.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ echo "Patching namespace to ${PROMETHEUS_NAMESPACE}..."
3838
echo "Applying Prometheus base..."
3939
kubectl apply -k "$TMPDIR" --server-side
4040

41-
echo "Waiting for Prometheus Operator deployment to become available..."
42-
kubectl wait --for=condition=Available deployment/prometheus-operator -n "$PROMETHEUS_NAMESPACE" --timeout=180s
43-
4441
echo "Waiting for Prometheus Operator pod to become ready..."
45-
kubectl wait --for=condition=Ready pod -n "$PROMETHEUS_NAMESPACE" -l app.kubernetes.io/name=prometheus-operator --timeout=120s
42+
kubectl wait --for=condition=Ready pod -n "$PROMETHEUS_NAMESPACE" -l app.kubernetes.io/name=prometheus-operator
4643

4744
echo "Applying prometheus Helm chart..."
4845
${HELM} template prometheus helm/prometheus ${PROMETHEUS_VALUES} | sed "s/cert-git-version/cert-${VERSION}/g" | kubectl apply -f -

helm/olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

helm/olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

helm/olmv1/values.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ options:
1212
features:
1313
enabled: []
1414
disabled: []
15-
podDisruptionBudget:
16-
enabled: true
17-
minAvailable: 1
1815
catalogd:
1916
enabled: true
2017
deployment:
@@ -23,9 +20,6 @@ options:
2320
features:
2421
enabled: []
2522
disabled: []
26-
podDisruptionBudget:
27-
enabled: true
28-
minAvailable: 1
2923
certManager:
3024
enabled: false
3125
e2e:

manifests/experimental-e2e.yaml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -87,40 +87,6 @@ spec:
8787
- Ingress
8888
- Egress
8989
---
90-
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml
91-
apiVersion: policy/v1
92-
kind: PodDisruptionBudget
93-
metadata:
94-
name: catalogd-controller-manager
95-
namespace: olmv1-system
96-
labels:
97-
app.kubernetes.io/name: catalogd
98-
app.kubernetes.io/part-of: olm
99-
annotations:
100-
olm.operatorframework.io/feature-set: experimental-e2e
101-
spec:
102-
minAvailable: 1
103-
selector:
104-
matchLabels:
105-
control-plane: catalogd-controller-manager
106-
---
107-
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml
108-
apiVersion: policy/v1
109-
kind: PodDisruptionBudget
110-
metadata:
111-
name: operator-controller-controller-manager
112-
namespace: olmv1-system
113-
labels:
114-
app.kubernetes.io/name: operator-controller
115-
app.kubernetes.io/part-of: olm
116-
annotations:
117-
olm.operatorframework.io/feature-set: experimental-e2e
118-
spec:
119-
minAvailable: 1
120-
selector:
121-
matchLabels:
122-
control-plane: operator-controller-controller-manager
123-
---
12490
# Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml
12591
apiVersion: v1
12692
kind: ServiceAccount

manifests/experimental.yaml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -87,40 +87,6 @@ spec:
8787
- Ingress
8888
- Egress
8989
---
90-
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml
91-
apiVersion: policy/v1
92-
kind: PodDisruptionBudget
93-
metadata:
94-
name: catalogd-controller-manager
95-
namespace: olmv1-system
96-
labels:
97-
app.kubernetes.io/name: catalogd
98-
app.kubernetes.io/part-of: olm
99-
annotations:
100-
olm.operatorframework.io/feature-set: experimental
101-
spec:
102-
minAvailable: 1
103-
selector:
104-
matchLabels:
105-
control-plane: catalogd-controller-manager
106-
---
107-
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml
108-
apiVersion: policy/v1
109-
kind: PodDisruptionBudget
110-
metadata:
111-
name: operator-controller-controller-manager
112-
namespace: olmv1-system
113-
labels:
114-
app.kubernetes.io/name: operator-controller
115-
app.kubernetes.io/part-of: olm
116-
annotations:
117-
olm.operatorframework.io/feature-set: experimental
118-
spec:
119-
minAvailable: 1
120-
selector:
121-
matchLabels:
122-
control-plane: operator-controller-controller-manager
123-
---
12490
# Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml
12591
apiVersion: v1
12692
kind: ServiceAccount

manifests/standard-e2e.yaml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -87,40 +87,6 @@ spec:
8787
- Ingress
8888
- Egress
8989
---
90-
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml
91-
apiVersion: policy/v1
92-
kind: PodDisruptionBudget
93-
metadata:
94-
name: catalogd-controller-manager
95-
namespace: olmv1-system
96-
labels:
97-
app.kubernetes.io/name: catalogd
98-
app.kubernetes.io/part-of: olm
99-
annotations:
100-
olm.operatorframework.io/feature-set: standard-e2e
101-
spec:
102-
minAvailable: 1
103-
selector:
104-
matchLabels:
105-
control-plane: catalogd-controller-manager
106-
---
107-
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml
108-
apiVersion: policy/v1
109-
kind: PodDisruptionBudget
110-
metadata:
111-
name: operator-controller-controller-manager
112-
namespace: olmv1-system
113-
labels:
114-
app.kubernetes.io/name: operator-controller
115-
app.kubernetes.io/part-of: olm
116-
annotations:
117-
olm.operatorframework.io/feature-set: standard-e2e
118-
spec:
119-
minAvailable: 1
120-
selector:
121-
matchLabels:
122-
control-plane: operator-controller-controller-manager
123-
---
12490
# Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml
12591
apiVersion: v1
12692
kind: ServiceAccount

manifests/standard.yaml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -87,40 +87,6 @@ spec:
8787
- Ingress
8888
- Egress
8989
---
90-
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml
91-
apiVersion: policy/v1
92-
kind: PodDisruptionBudget
93-
metadata:
94-
name: catalogd-controller-manager
95-
namespace: olmv1-system
96-
labels:
97-
app.kubernetes.io/name: catalogd
98-
app.kubernetes.io/part-of: olm
99-
annotations:
100-
olm.operatorframework.io/feature-set: standard
101-
spec:
102-
minAvailable: 1
103-
selector:
104-
matchLabels:
105-
control-plane: catalogd-controller-manager
106-
---
107-
# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml
108-
apiVersion: policy/v1
109-
kind: PodDisruptionBudget
110-
metadata:
111-
name: operator-controller-controller-manager
112-
namespace: olmv1-system
113-
labels:
114-
app.kubernetes.io/name: operator-controller
115-
app.kubernetes.io/part-of: olm
116-
annotations:
117-
olm.operatorframework.io/feature-set: standard
118-
spec:
119-
minAvailable: 1
120-
selector:
121-
matchLabels:
122-
control-plane: operator-controller-controller-manager
123-
---
12490
# Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml
12591
apiVersion: v1
12692
kind: ServiceAccount

0 commit comments

Comments
 (0)