Skip to content

Commit d32aa02

Browse files
authored
Make deployments HA-ready with configurable replica count (#2371)
Remove test code per maintainer feedback, keep only replicas config knobs Per maintainer review, upstream should provide configurable replicas (the knobs) but HA-specific tests (node drain, multi-replica assertions) belong downstream.
1 parent 4510b1b commit d32aa02

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

helm/olmv1/templates/deployment-olmv1-system-catalogd-controller-manager.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ metadata:
1212
namespace: {{ .Values.namespaces.olmv1.name }}
1313
spec:
1414
minReadySeconds: 5
15-
replicas: 1
15+
replicas: {{ .Values.options.catalogd.deployment.replicas }}
1616
strategy:
1717
type: RollingUpdate
1818
rollingUpdate:
19-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
19+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
2020
maxUnavailable: 0 # Never allow pods to be unavailable during updates
2121
selector:
2222
matchLabels:

helm/olmv1/templates/deployment-olmv1-system-operator-controller-controller-manager.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ metadata:
1111
name: operator-controller-controller-manager
1212
namespace: {{ .Values.namespaces.olmv1.name }}
1313
spec:
14-
replicas: 1
14+
replicas: {{ .Values.options.operatorController.deployment.replicas }}
1515
strategy:
1616
type: RollingUpdate
1717
rollingUpdate:
18-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
18+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
1919
maxUnavailable: 0 # Never allow pods to be unavailable during updates
2020
selector:
2121
matchLabels:

helm/olmv1/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ options:
88
enabled: true
99
deployment:
1010
image: quay.io/operator-framework/operator-controller:devel
11+
replicas: 1
1112
extraArguments: []
1213
features:
1314
enabled: []
@@ -19,6 +20,7 @@ options:
1920
enabled: true
2021
deployment:
2122
image: quay.io/operator-framework/catalogd:devel
23+
replicas: 1
2224
extraArguments: []
2325
features:
2426
enabled: []

manifests/experimental-e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2582,7 +2582,7 @@ spec:
25822582
strategy:
25832583
type: RollingUpdate
25842584
rollingUpdate:
2585-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
2585+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
25862586
maxUnavailable: 0 # Never allow pods to be unavailable during updates
25872587
selector:
25882588
matchLabels:
@@ -2733,7 +2733,7 @@ spec:
27332733
strategy:
27342734
type: RollingUpdate
27352735
rollingUpdate:
2736-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
2736+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
27372737
maxUnavailable: 0 # Never allow pods to be unavailable during updates
27382738
selector:
27392739
matchLabels:

manifests/experimental.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,7 +2502,7 @@ spec:
25022502
strategy:
25032503
type: RollingUpdate
25042504
rollingUpdate:
2505-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
2505+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
25062506
maxUnavailable: 0 # Never allow pods to be unavailable during updates
25072507
selector:
25082508
matchLabels:
@@ -2640,7 +2640,7 @@ spec:
26402640
strategy:
26412641
type: RollingUpdate
26422642
rollingUpdate:
2643-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
2643+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
26442644
maxUnavailable: 0 # Never allow pods to be unavailable during updates
26452645
selector:
26462646
matchLabels:

manifests/standard-e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,7 @@ spec:
17821782
strategy:
17831783
type: RollingUpdate
17841784
rollingUpdate:
1785-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
1785+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
17861786
maxUnavailable: 0 # Never allow pods to be unavailable during updates
17871787
selector:
17881788
matchLabels:
@@ -1932,7 +1932,7 @@ spec:
19321932
strategy:
19331933
type: RollingUpdate
19341934
rollingUpdate:
1935-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
1935+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
19361936
maxUnavailable: 0 # Never allow pods to be unavailable during updates
19371937
selector:
19381938
matchLabels:

manifests/standard.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ spec:
17021702
strategy:
17031703
type: RollingUpdate
17041704
rollingUpdate:
1705-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
1705+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
17061706
maxUnavailable: 0 # Never allow pods to be unavailable during updates
17071707
selector:
17081708
matchLabels:
@@ -1839,7 +1839,7 @@ spec:
18391839
strategy:
18401840
type: RollingUpdate
18411841
rollingUpdate:
1842-
maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates
1842+
maxSurge: 1 # Allow temporary extra pod for zero-downtime updates
18431843
maxUnavailable: 0 # Never allow pods to be unavailable during updates
18441844
selector:
18451845
matchLabels:

0 commit comments

Comments
 (0)