From f8c25cf2afb36930d7c2a94fdc7a045b48740db4 Mon Sep 17 00:00:00 2001 From: Peter Brachwitz Date: Tue, 18 Nov 2025 14:24:11 +0100 Subject: [PATCH 1/2] Test against OCP 4.20.1 (#8911) Test ECK against OCP 4.20.4 in order to be able to declare that we are compatible. Signed-off-by: Lars Barmettler --- .buildkite/e2e/release-branch-matrix.yaml | 2 +- README.md | 2 +- hack/deployer/config/plans.yml | 4 ++-- hack/operatorhub/templates/csv.tpl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.buildkite/e2e/release-branch-matrix.yaml b/.buildkite/e2e/release-branch-matrix.yaml index 2bc5fd7abf0..e8d35822595 100644 --- a/.buildkite/e2e/release-branch-matrix.yaml +++ b/.buildkite/e2e/release-branch-matrix.yaml @@ -65,7 +65,7 @@ fixed: E2E_PROVIDER: ocp mixed: - - DEPLOYER_CLIENT_VERSION: "4.19.2" + - DEPLOYER_CLIENT_VERSION: "4.20.4" - label: eks-arm fixed: diff --git a/README.md b/README.md index 22f472806cb..3d96c7d8cb0 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Current features: Supported versions: * Kubernetes 1.30-1.34 -* OpenShift 4.15-4.19 +* OpenShift 4.15-4.20 * Elasticsearch, Kibana, APM Server: 7.17+, 8+, 9+ * Enterprise Search: 7.7+, 8+ * Beats: 7.17+, 8+, 9+ diff --git a/hack/deployer/config/plans.yml b/hack/deployer/config/plans.yml index 2c83b9da603..3f65f9e1f47 100644 --- a/hack/deployer/config/plans.yml +++ b/hack/deployer/config/plans.yml @@ -93,7 +93,7 @@ plans: - id: ocp-ci operation: create clusterName: ci - clientVersion: 4.19.14 + clientVersion: 4.20.4 provider: ocp machineType: n1-standard-8 serviceAccount: true @@ -103,7 +103,7 @@ plans: - id: ocp-dev operation: create clusterName: dev - clientVersion: 4.19.14 + clientVersion: 4.20.4 provider: ocp machineType: n1-standard-8 serviceAccount: true diff --git a/hack/operatorhub/templates/csv.tpl b/hack/operatorhub/templates/csv.tpl index 321d06b5c78..c0a7618e07c 100644 --- a/hack/operatorhub/templates/csv.tpl +++ b/hack/operatorhub/templates/csv.tpl @@ -286,7 +286,7 @@ spec: * Kubernetes 1.30-1.34 - * OpenShift 4.15-4.19 + * OpenShift 4.15-4.20 * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS) From aad18dc6b84a7ede6e3c755d26009b8826e1c944 Mon Sep 17 00:00:00 2001 From: Lars Barmettler Date: Fri, 21 Nov 2025 12:02:22 +0100 Subject: [PATCH 2/2] Set persistentVolumeClaimRetentionPolicy per default delete Signed-off-by: Lars Barmettler --- deploy/eck-operator/templates/statefulset.yaml | 3 +++ deploy/eck-operator/values.yaml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/deploy/eck-operator/templates/statefulset.yaml b/deploy/eck-operator/templates/statefulset.yaml index 3fcc1575804..6c580fb32cd 100644 --- a/deploy/eck-operator/templates/statefulset.yaml +++ b/deploy/eck-operator/templates/statefulset.yaml @@ -20,6 +20,9 @@ spec: {{- include "eck-operator.selectorLabels" . | nindent 6 }} serviceName: {{ include "eck-operator.fullname" . }} replicas: {{ .Values.replicaCount }} + persistentVolumeClaimRetentionPolicy: + whenDeleted: {{ .Values.persistentVolumeClaimRetentionPolicy.whenDeleted }} + whenScaled: {{ .Values.persistentVolumeClaimRetentionPolicy.whenScaled }} template: metadata: annotations: diff --git a/deploy/eck-operator/values.yaml b/deploy/eck-operator/values.yaml index adc48be3d16..a54b28cd82e 100644 --- a/deploy/eck-operator/values.yaml +++ b/deploy/eck-operator/values.yaml @@ -17,6 +17,11 @@ installCRDs: true # replicaCount is the number of operator pods to run. replicaCount: 1 +# the strategy what happens with pvc on the statefulset +persistentVolumeClaimRetentionPolicy: + whenDeleted: Delete + whenScaled: Delete + image: # repository is the container image prefixed by the registry name. repository: docker.elastic.co/eck/eck-operator