Skip to content

OCPBUGS-94187: Backport HA topology deployment scaling to release-4.22 #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Jul 2, 2026
Merged

OCPBUGS-94187: Backport HA topology deployment scaling to release-4.22 #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
631a482
UPSTREAM: <carry>: OCPBUGS-62517: Set replicas=1, PDB, and pod anti-a…
tmshort Apr 23, 2026
bf00c26
UPSTREAM: <carry>: use AlwaysAllow UnhealthyPodEvictionPolicy option …
atiratree May 8, 2026
a786e3a
UPSTREAM: <carry>: add OLMv1 topology-based deployment scaling e2e test
tmshort May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions helm/olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
{{- if .Values.options.catalogd.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ .Values.options.catalogd.podDisruptionBudget.maxUnavailable }}
{{- end }}
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand Down
1 change: 1 addition & 0 deletions helm/olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
{{- if .Values.options.operatorController.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ .Values.options.operatorController.podDisruptionBudget.maxUnavailable }}
{{- end }}
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
2 changes: 2 additions & 0 deletions manifests/experimental-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ metadata:
olm.operatorframework.io/feature-set: experimental-e2e
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand All @@ -117,6 +118,7 @@ metadata:
olm.operatorframework.io/feature-set: experimental-e2e
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
2 changes: 2 additions & 0 deletions manifests/experimental.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ metadata:
olm.operatorframework.io/feature-set: experimental
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand All @@ -117,6 +118,7 @@ metadata:
olm.operatorframework.io/feature-set: experimental
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
2 changes: 2 additions & 0 deletions manifests/standard-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ metadata:
olm.operatorframework.io/feature-set: standard-e2e
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand All @@ -117,6 +118,7 @@ metadata:
olm.operatorframework.io/feature-set: standard-e2e
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
2 changes: 2 additions & 0 deletions manifests/standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ metadata:
olm.operatorframework.io/feature-set: standard
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: catalogd-controller-manager
Expand All @@ -117,6 +118,7 @@ metadata:
olm.operatorframework.io/feature-set: standard
spec:
minAvailable: 1
unhealthyPodEvictionPolicy: AlwaysAllow
selector:
matchLabels:
control-plane: operator-controller-controller-manager
Expand Down
8 changes: 8 additions & 0 deletions openshift/catalogd/manifests-experimental.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,14 @@ spec:
operator: In
values:
- linux
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels:
control-plane: catalogd-controller-manager
topologyKey: kubernetes.io/hostname
weight: 100
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/control-plane: ""
Expand Down
8 changes: 8 additions & 0 deletions openshift/catalogd/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,14 @@ spec:
operator: In
values:
- linux
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels:
control-plane: catalogd-controller-manager
topologyKey: kubernetes.io/hostname
weight: 100
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/control-plane: ""
Expand Down
10 changes: 10 additions & 0 deletions openshift/helm/catalogd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ options:
enabled: true
deployment:
image: ${CATALOGD_IMAGE}
replicas: 1
podDisruptionBudget:
enabled: false
operatorController:
Expand All @@ -25,6 +26,15 @@ namespaces:
# Deployment values for catalogd
deployments:
templateSpec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
topologyKey: kubernetes.io/hostname
labelSelector:
matchLabels:
control-plane: catalogd-controller-manager
priorityClassName: system-cluster-critical
securityContext:
seLinuxOptions:
Expand Down
10 changes: 10 additions & 0 deletions openshift/helm/operator-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ options:
enabled: true
deployment:
image: ${OPERATOR_CONTROLLER_IMAGE}
replicas: 1
podDisruptionBudget:
enabled: false
catalogd:
Expand All @@ -26,6 +27,15 @@ namespaces:
# Deployment values for operator-controller
deployments:
templateSpec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
topologyKey: kubernetes.io/hostname
labelSelector:
matchLabels:
control-plane: operator-controller-controller-manager
priorityClassName: system-cluster-critical
securityContext:
seLinuxOptions:
Expand Down
8 changes: 8 additions & 0 deletions openshift/operator-controller/manifests-experimental.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,14 @@ spec:
operator: In
values:
- linux
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels:
control-plane: operator-controller-controller-manager
topologyKey: kubernetes.io/hostname
weight: 100
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/control-plane: ""
Expand Down
8 changes: 8 additions & 0 deletions openshift/operator-controller/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,14 @@ spec:
operator: In
values:
- linux
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels:
control-plane: operator-controller-controller-manager
topologyKey: kubernetes.io/hostname
weight: 100
nodeSelector:
kubernetes.io/os: linux
node-role.kubernetes.io/control-plane: ""
Expand Down
10 changes: 10 additions & 0 deletions openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,6 +1632,16 @@
"lifecycle": "blocking",
"environmentSelector": {}
},
{
"name": "[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 topology-based deployment scaling should configure replicas and PodDisruptionBudgets to match the cluster control plane topology",
"labels": {},
"resources": {
"isolation": {}
},
"source": "openshift:payload:olmv1",
"lifecycle": "blocking",
"environmentSelector": {}
},
{
"name": "[sig-olmv1] OLMv1 should pass a trivial sanity check",
"labels": {},
Expand Down
6 changes: 3 additions & 3 deletions openshift/tests-extension/pkg/bindata/catalog/catalog.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions openshift/tests-extension/pkg/bindata/operator/operator.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions openshift/tests-extension/pkg/bindata/singleown/bundle/bundle.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions openshift/tests-extension/pkg/bindata/singleown/index/index.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading