From 06aaa453af5c7fe536d91a35bd07e343d0833ec2 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Wed, 3 Dec 2025 09:07:20 -0500 Subject: [PATCH] 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 5ed8cf4a65742987d7c54151ce1c0c63943fa49d. --- hack/test/install-prometheus.sh | 5 +-- ...disruptionbudget-olmv1-system-catalogd.yml | 22 ------------ ...udget-olmv1-system-operator-controller.yml | 22 ------------ helm/olmv1/values.yaml | 6 ---- manifests/experimental-e2e.yaml | 34 ------------------- manifests/experimental.yaml | 34 ------------------- manifests/standard-e2e.yaml | 34 ------------------- manifests/standard.yaml | 34 ------------------- 8 files changed, 1 insertion(+), 190 deletions(-) delete mode 100644 helm/olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml delete mode 100644 helm/olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml diff --git a/hack/test/install-prometheus.sh b/hack/test/install-prometheus.sh index e2e13c96f..f458b2d01 100755 --- a/hack/test/install-prometheus.sh +++ b/hack/test/install-prometheus.sh @@ -38,11 +38,8 @@ echo "Patching namespace to ${PROMETHEUS_NAMESPACE}..." echo "Applying Prometheus base..." kubectl apply -k "$TMPDIR" --server-side -echo "Waiting for Prometheus Operator deployment to become available..." -kubectl wait --for=condition=Available deployment/prometheus-operator -n "$PROMETHEUS_NAMESPACE" --timeout=180s - echo "Waiting for Prometheus Operator pod to become ready..." -kubectl wait --for=condition=Ready pod -n "$PROMETHEUS_NAMESPACE" -l app.kubernetes.io/name=prometheus-operator --timeout=120s +kubectl wait --for=condition=Ready pod -n "$PROMETHEUS_NAMESPACE" -l app.kubernetes.io/name=prometheus-operator echo "Applying prometheus Helm chart..." ${HELM} template prometheus helm/prometheus ${PROMETHEUS_VALUES} | sed "s/cert-git-version/cert-${VERSION}/g" | kubectl apply -f - diff --git a/helm/olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml b/helm/olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml deleted file mode 100644 index 7e6ec2e33..000000000 --- a/helm/olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if and .Values.options.catalogd.enabled .Values.options.catalogd.podDisruptionBudget.enabled }} -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: catalogd-controller-manager - namespace: {{ .Values.namespaces.olmv1.name }} - labels: - app.kubernetes.io/name: catalogd - {{- include "olmv1.labels" . | nindent 4 }} - annotations: - {{- include "olmv1.annotations" . | nindent 4 }} -spec: - {{- if .Values.options.catalogd.podDisruptionBudget.minAvailable }} - minAvailable: {{ .Values.options.catalogd.podDisruptionBudget.minAvailable }} - {{- end }} - {{- if .Values.options.catalogd.podDisruptionBudget.maxUnavailable }} - maxUnavailable: {{ .Values.options.catalogd.podDisruptionBudget.maxUnavailable }} - {{- end }} - selector: - matchLabels: - control-plane: catalogd-controller-manager -{{- end }} diff --git a/helm/olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml b/helm/olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml deleted file mode 100644 index 0d98d528f..000000000 --- a/helm/olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if and .Values.options.operatorController.enabled .Values.options.operatorController.podDisruptionBudget.enabled }} -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: operator-controller-controller-manager - namespace: {{ .Values.namespaces.olmv1.name }} - labels: - app.kubernetes.io/name: operator-controller - {{- include "olmv1.labels" . | nindent 4 }} - annotations: - {{- include "olmv1.annotations" . | nindent 4 }} -spec: - {{- if .Values.options.operatorController.podDisruptionBudget.minAvailable }} - minAvailable: {{ .Values.options.operatorController.podDisruptionBudget.minAvailable }} - {{- end }} - {{- if .Values.options.operatorController.podDisruptionBudget.maxUnavailable }} - maxUnavailable: {{ .Values.options.operatorController.podDisruptionBudget.maxUnavailable }} - {{- end }} - selector: - matchLabels: - control-plane: operator-controller-controller-manager -{{- end }} diff --git a/helm/olmv1/values.yaml b/helm/olmv1/values.yaml index cb454f625..5ab9d7672 100644 --- a/helm/olmv1/values.yaml +++ b/helm/olmv1/values.yaml @@ -12,9 +12,6 @@ options: features: enabled: [] disabled: [] - podDisruptionBudget: - enabled: true - minAvailable: 1 catalogd: enabled: true deployment: @@ -23,9 +20,6 @@ options: features: enabled: [] disabled: [] - podDisruptionBudget: - enabled: true - minAvailable: 1 certManager: enabled: false e2e: diff --git a/manifests/experimental-e2e.yaml b/manifests/experimental-e2e.yaml index e536cd72a..f82880eea 100644 --- a/manifests/experimental-e2e.yaml +++ b/manifests/experimental-e2e.yaml @@ -87,40 +87,6 @@ spec: - Ingress - Egress --- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: catalogd-controller-manager - namespace: olmv1-system - labels: - app.kubernetes.io/name: catalogd - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: experimental-e2e -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: catalogd-controller-manager ---- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: operator-controller-controller-manager - namespace: olmv1-system - labels: - app.kubernetes.io/name: operator-controller - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: experimental-e2e -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: operator-controller-controller-manager ---- # Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml apiVersion: v1 kind: ServiceAccount diff --git a/manifests/experimental.yaml b/manifests/experimental.yaml index f88debab0..6963048a9 100644 --- a/manifests/experimental.yaml +++ b/manifests/experimental.yaml @@ -87,40 +87,6 @@ spec: - Ingress - Egress --- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: catalogd-controller-manager - namespace: olmv1-system - labels: - app.kubernetes.io/name: catalogd - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: experimental -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: catalogd-controller-manager ---- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: operator-controller-controller-manager - namespace: olmv1-system - labels: - app.kubernetes.io/name: operator-controller - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: experimental -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: operator-controller-controller-manager ---- # Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml apiVersion: v1 kind: ServiceAccount diff --git a/manifests/standard-e2e.yaml b/manifests/standard-e2e.yaml index 1aed38ba9..5c9590784 100644 --- a/manifests/standard-e2e.yaml +++ b/manifests/standard-e2e.yaml @@ -87,40 +87,6 @@ spec: - Ingress - Egress --- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: catalogd-controller-manager - namespace: olmv1-system - labels: - app.kubernetes.io/name: catalogd - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: standard-e2e -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: catalogd-controller-manager ---- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: operator-controller-controller-manager - namespace: olmv1-system - labels: - app.kubernetes.io/name: operator-controller - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: standard-e2e -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: operator-controller-controller-manager ---- # Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml apiVersion: v1 kind: ServiceAccount diff --git a/manifests/standard.yaml b/manifests/standard.yaml index 34cc57918..95e400c26 100644 --- a/manifests/standard.yaml +++ b/manifests/standard.yaml @@ -87,40 +87,6 @@ spec: - Ingress - Egress --- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-catalogd.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: catalogd-controller-manager - namespace: olmv1-system - labels: - app.kubernetes.io/name: catalogd - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: standard -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: catalogd-controller-manager ---- -# Source: olmv1/templates/poddisruptionbudget-olmv1-system-operator-controller.yml -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: operator-controller-controller-manager - namespace: olmv1-system - labels: - app.kubernetes.io/name: operator-controller - app.kubernetes.io/part-of: olm - annotations: - olm.operatorframework.io/feature-set: standard -spec: - minAvailable: 1 - selector: - matchLabels: - control-plane: operator-controller-controller-manager ---- # Source: olmv1/templates/serviceaccount-olmv1-system-common-controller-manager.yml apiVersion: v1 kind: ServiceAccount