From adc84cf6152fa37b2c49148200c41149a5c307a1 Mon Sep 17 00:00:00 2001 From: Jian Zhang Date: Sat, 11 Oct 2025 15:41:12 +0800 Subject: [PATCH] UPSTREAM: : add rollingUpdate strategy --- ...oyment-olmv1-system-catalogd-controller-manager.yml | 5 +++++ ...1-system-operator-controller-controller-manager.yml | 5 +++++ manifests/experimental-e2e.yaml | 10 ++++++++++ manifests/experimental.yaml | 10 ++++++++++ manifests/standard-e2e.yaml | 10 ++++++++++ manifests/standard.yaml | 10 ++++++++++ openshift/catalogd/manifests-experimental.yaml | 5 +++++ openshift/catalogd/manifests.yaml | 5 +++++ .../operator-controller/manifests-experimental.yaml | 5 +++++ openshift/operator-controller/manifests.yaml | 5 +++++ 10 files changed, 70 insertions(+) diff --git a/helm/olmv1/templates/deployment-olmv1-system-catalogd-controller-manager.yml b/helm/olmv1/templates/deployment-olmv1-system-catalogd-controller-manager.yml index 20cc698c2..7ab3f1bf5 100644 --- a/helm/olmv1/templates/deployment-olmv1-system-catalogd-controller-manager.yml +++ b/helm/olmv1/templates/deployment-olmv1-system-catalogd-controller-manager.yml @@ -13,6 +13,11 @@ metadata: spec: minReadySeconds: 5 replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: catalogd-controller-manager diff --git a/helm/olmv1/templates/deployment-olmv1-system-operator-controller-controller-manager.yml b/helm/olmv1/templates/deployment-olmv1-system-operator-controller-controller-manager.yml index a62558f8e..c3248a9a1 100644 --- a/helm/olmv1/templates/deployment-olmv1-system-operator-controller-controller-manager.yml +++ b/helm/olmv1/templates/deployment-olmv1-system-operator-controller-controller-manager.yml @@ -12,6 +12,11 @@ metadata: namespace: {{ .Values.namespaces.olmv1.name }} spec: replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: operator-controller-controller-manager diff --git a/manifests/experimental-e2e.yaml b/manifests/experimental-e2e.yaml index 1bc93321e..8758f9df1 100644 --- a/manifests/experimental-e2e.yaml +++ b/manifests/experimental-e2e.yaml @@ -2003,6 +2003,11 @@ metadata: spec: minReadySeconds: 5 replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: catalogd-controller-manager @@ -2148,6 +2153,11 @@ metadata: namespace: olmv1-system spec: replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: operator-controller-controller-manager diff --git a/manifests/experimental.yaml b/manifests/experimental.yaml index 69128a8b7..4ab77d1ff 100644 --- a/manifests/experimental.yaml +++ b/manifests/experimental.yaml @@ -1928,6 +1928,11 @@ metadata: spec: minReadySeconds: 5 replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: catalogd-controller-manager @@ -2061,6 +2066,11 @@ metadata: namespace: olmv1-system spec: replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: operator-controller-controller-manager diff --git a/manifests/standard-e2e.yaml b/manifests/standard-e2e.yaml index 72f8b82dc..783beec51 100644 --- a/manifests/standard-e2e.yaml +++ b/manifests/standard-e2e.yaml @@ -1762,6 +1762,11 @@ metadata: spec: minReadySeconds: 5 replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: catalogd-controller-manager @@ -1906,6 +1911,11 @@ metadata: namespace: olmv1-system spec: replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: operator-controller-controller-manager diff --git a/manifests/standard.yaml b/manifests/standard.yaml index 75ee176f7..95e400c26 100644 --- a/manifests/standard.yaml +++ b/manifests/standard.yaml @@ -1687,6 +1687,11 @@ metadata: spec: minReadySeconds: 5 replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: catalogd-controller-manager @@ -1819,6 +1824,11 @@ metadata: namespace: olmv1-system spec: replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: operator-controller-controller-manager diff --git a/openshift/catalogd/manifests-experimental.yaml b/openshift/catalogd/manifests-experimental.yaml index a6e814b91..cbcf463b9 100644 --- a/openshift/catalogd/manifests-experimental.yaml +++ b/openshift/catalogd/manifests-experimental.yaml @@ -835,6 +835,11 @@ metadata: spec: minReadySeconds: 5 replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: catalogd-controller-manager diff --git a/openshift/catalogd/manifests.yaml b/openshift/catalogd/manifests.yaml index 7035edaff..17883941c 100644 --- a/openshift/catalogd/manifests.yaml +++ b/openshift/catalogd/manifests.yaml @@ -835,6 +835,11 @@ metadata: spec: minReadySeconds: 5 replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: catalogd-controller-manager diff --git a/openshift/operator-controller/manifests-experimental.yaml b/openshift/operator-controller/manifests-experimental.yaml index a093720da..713c0e0aa 100644 --- a/openshift/operator-controller/manifests-experimental.yaml +++ b/openshift/operator-controller/manifests-experimental.yaml @@ -1285,6 +1285,11 @@ metadata: namespace: openshift-operator-controller spec: replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: operator-controller-controller-manager diff --git a/openshift/operator-controller/manifests.yaml b/openshift/operator-controller/manifests.yaml index 921cd2c10..091dfe26a 100644 --- a/openshift/operator-controller/manifests.yaml +++ b/openshift/operator-controller/manifests.yaml @@ -1054,6 +1054,11 @@ metadata: namespace: openshift-operator-controller spec: replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 # Allow temporary 2 pods (1 + 1) for zero-downtime updates + maxUnavailable: 0 # Never allow pods to be unavailable during updates selector: matchLabels: control-plane: operator-controller-controller-manager