diff --git a/config/crds/v1/all-crds.yaml b/config/crds/v1/all-crds.yaml index bd4e0635e4e..f4db5083f40 100644 --- a/config/crds/v1/all-crds.yaml +++ b/config/crds/v1/all-crds.yaml @@ -4674,7 +4674,7 @@ spec: The behavior depends on the license level. With a Basic license or if podDisruptionBudget.spec is not empty: The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default podDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default podDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. With an Enterprise license and if podDisruptionBudget.spec is empty: The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions for certain roles according to the health status of the cluster. diff --git a/config/crds/v1/resources/elasticsearch.k8s.elastic.co_elasticsearches.yaml b/config/crds/v1/resources/elasticsearch.k8s.elastic.co_elasticsearches.yaml index 3240b287254..e9e3208a328 100644 --- a/config/crds/v1/resources/elasticsearch.k8s.elastic.co_elasticsearches.yaml +++ b/config/crds/v1/resources/elasticsearch.k8s.elastic.co_elasticsearches.yaml @@ -9622,7 +9622,7 @@ spec: The behavior depends on the license level. With a Basic license or if podDisruptionBudget.spec is not empty: The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default podDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default podDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. With an Enterprise license and if podDisruptionBudget.spec is empty: The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions for certain roles according to the health status of the cluster. diff --git a/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml b/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml index 97707a8ba80..1f2e7ca4bfa 100644 --- a/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml +++ b/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml @@ -4716,7 +4716,7 @@ spec: The behavior depends on the license level. With a Basic license or if podDisruptionBudget.spec is not empty: The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default podDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default podDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. With an Enterprise license and if podDisruptionBudget.spec is empty: The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions for certain roles according to the health status of the cluster. diff --git a/deploy/eck-stack/charts/eck-elasticsearch/values.yaml b/deploy/eck-stack/charts/eck-elasticsearch/values.yaml index 322dded4dea..69dfa09280b 100644 --- a/deploy/eck-stack/charts/eck-elasticsearch/values.yaml +++ b/deploy/eck-stack/charts/eck-elasticsearch/values.yaml @@ -133,7 +133,7 @@ volumeClaimDeletePolicy: "" # Settings to limit the disruption when pods need to be rescheduled for some reason such as upgrades or routine maintenance. # By default, if not set, the operator sets a budget that doesn't allow any pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. -# In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. +# In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. # To completely disable the pod disruption budget set `disabled` to true. # # podDisruptionBudget: diff --git a/docs/reference/api-reference/3_0_0.md b/docs/reference/api-reference/3_0_0.md index e4947cd1e30..2e8f1e175b4 100644 --- a/docs/reference/api-reference/3_0_0.md +++ b/docs/reference/api-reference/3_0_0.md @@ -1093,7 +1093,7 @@ ElasticsearchSpec holds the specification of an Elasticsearch cluster. | *`transport`* __[TransportConfig](#transportconfig)__ | Transport holds transport layer settings for Elasticsearch. | | *`nodeSets`* __[NodeSet](#nodeset) array__ | NodeSets allow specifying groups of Elasticsearch nodes sharing the same configuration and Pod templates. | | *`updateStrategy`* __[UpdateStrategy](#updatestrategy)__ | UpdateStrategy specifies how updates to the cluster should be performed. | -| *`podDisruptionBudget`* __[PodDisruptionBudgetTemplate](#poddisruptionbudgettemplate)__ | PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster.
The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`.
In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1.
To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). | +| *`podDisruptionBudget`* __[PodDisruptionBudgetTemplate](#poddisruptionbudgettemplate)__ | PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster.
The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`.
In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1.
To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). | | *`auth`* __[Auth](#auth)__ | Auth contains user authentication and authorization security settings for Elasticsearch. | | *`secureSettings`* __[SecretSource](#secretsource) array__ | SecureSettings is a list of references to Kubernetes secrets containing sensitive configuration options for Elasticsearch. | | *`serviceAccountName`* __string__ | ServiceAccountName is used to check access from the current resource to a resource (for ex. a remote Elasticsearch cluster) in a different namespace.
Can only be used if ECK is enforcing RBAC on references. | diff --git a/docs/reference/api-reference/3_1_0.md b/docs/reference/api-reference/3_1_0.md index 6243d51457e..7fabf37e04b 100644 --- a/docs/reference/api-reference/3_1_0.md +++ b/docs/reference/api-reference/3_1_0.md @@ -1093,7 +1093,7 @@ ElasticsearchSpec holds the specification of an Elasticsearch cluster. | *`transport`* __[TransportConfig](#transportconfig)__ | Transport holds transport layer settings for Elasticsearch. | | *`nodeSets`* __[NodeSet](#nodeset) array__ | NodeSets allow specifying groups of Elasticsearch nodes sharing the same configuration and Pod templates. | | *`updateStrategy`* __[UpdateStrategy](#updatestrategy)__ | UpdateStrategy specifies how updates to the cluster should be performed. | -| *`podDisruptionBudget`* __[PodDisruptionBudgetTemplate](#poddisruptionbudgettemplate)__ | PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster.
The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`.
In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1.
To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). | +| *`podDisruptionBudget`* __[PodDisruptionBudgetTemplate](#poddisruptionbudgettemplate)__ | PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster.
The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`.
In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1.
To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). | | *`auth`* __[Auth](#auth)__ | Auth contains user authentication and authorization security settings for Elasticsearch. | | *`secureSettings`* __[SecretSource](#secretsource) array__ | SecureSettings is a list of references to Kubernetes secrets containing sensitive configuration options for Elasticsearch. | | *`serviceAccountName`* __string__ | ServiceAccountName is used to check access from the current resource to a resource (for ex. a remote Elasticsearch cluster) in a different namespace.
Can only be used if ECK is enforcing RBAC on references. | diff --git a/docs/reference/api-reference/3_2_0.md b/docs/reference/api-reference/3_2_0.md index 1a1155d3490..898f90a63d7 100644 --- a/docs/reference/api-reference/3_2_0.md +++ b/docs/reference/api-reference/3_2_0.md @@ -1093,7 +1093,7 @@ ElasticsearchSpec holds the specification of an Elasticsearch cluster. | *`transport`* __[TransportConfig](#transportconfig)__ | Transport holds transport layer settings for Elasticsearch. | | *`nodeSets`* __[NodeSet](#nodeset) array__ | NodeSets allow specifying groups of Elasticsearch nodes sharing the same configuration and Pod templates. | | *`updateStrategy`* __[UpdateStrategy](#updatestrategy)__ | UpdateStrategy specifies how updates to the cluster should be performed. | -| *`podDisruptionBudget`* __[PodDisruptionBudgetTemplate](#poddisruptionbudgettemplate)__ | PodDisruptionBudget provides access to the default Pod disruption budget(s) for the Elasticsearch cluster.
The behavior depends on the license level.
With a Basic license or if podDisruptionBudget.spec is not empty:
The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`.
In all other cases the default podDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1.
With an Enterprise license and if podDisruptionBudget.spec is empty:
The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions
for certain roles according to the health status of the cluster.
Example:
All data roles (excluding frozen): allows disruptions only when the cluster is green.
All other roles: allows disruptions only when the cluster is yellow or green.
To disable, set `podDisruptionBudget` to the empty value (`{}` in YAML). | +| *`podDisruptionBudget`* __[PodDisruptionBudgetTemplate](#poddisruptionbudgettemplate)__ | PodDisruptionBudget provides access to the default Pod disruption budget(s) for the Elasticsearch cluster.
The behavior depends on the license level.
With a Basic license or if podDisruptionBudget.spec is not empty:
The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`.
In all other cases the default podDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1.
With an Enterprise license and if podDisruptionBudget.spec is empty:
The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions
for certain roles according to the health status of the cluster.
Example:
All data roles (excluding frozen): allows disruptions only when the cluster is green.
All other roles: allows disruptions only when the cluster is yellow or green.
To disable, set `podDisruptionBudget` to the empty value (`{}` in YAML). | | *`auth`* __[Auth](#auth)__ | Auth contains user authentication and authorization security settings for Elasticsearch. | | *`secureSettings`* __[SecretSource](#secretsource) array__ | SecureSettings is a list of references to Kubernetes secrets containing sensitive configuration options for Elasticsearch. | | *`serviceAccountName`* __string__ | ServiceAccountName is used to check access from the current resource to a resource (for ex. a remote Elasticsearch cluster) in a different namespace.
Can only be used if ECK is enforcing RBAC on references. | diff --git a/docs/reference/api-reference/main.md b/docs/reference/api-reference/main.md index 6e9c95059f7..a8dbd45a9c0 100644 --- a/docs/reference/api-reference/main.md +++ b/docs/reference/api-reference/main.md @@ -1093,7 +1093,7 @@ ElasticsearchSpec holds the specification of an Elasticsearch cluster. | *`transport`* __[TransportConfig](#transportconfig)__ | Transport holds transport layer settings for Elasticsearch. | | *`nodeSets`* __[NodeSet](#nodeset) array__ | NodeSets allow specifying groups of Elasticsearch nodes sharing the same configuration and Pod templates. | | *`updateStrategy`* __[UpdateStrategy](#updatestrategy)__ | UpdateStrategy specifies how updates to the cluster should be performed. | -| *`podDisruptionBudget`* __[PodDisruptionBudgetTemplate](#poddisruptionbudgettemplate)__ | PodDisruptionBudget provides access to the default Pod disruption budget(s) for the Elasticsearch cluster.
The behavior depends on the license level.
With a Basic license or if podDisruptionBudget.spec is not empty:
The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`.
In all other cases the default podDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1.
With an Enterprise license and if podDisruptionBudget.spec is empty:
The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions
for certain roles according to the health status of the cluster.
Example:
All data roles (excluding frozen): allows disruptions only when the cluster is green.
All other roles: allows disruptions only when the cluster is yellow or green.
To disable, set `podDisruptionBudget` to the empty value (`{}` in YAML). | +| *`podDisruptionBudget`* __[PodDisruptionBudgetTemplate](#poddisruptionbudgettemplate)__ | PodDisruptionBudget provides access to the default Pod disruption budget(s) for the Elasticsearch cluster.
The behavior depends on the license level.
With a Basic license or if podDisruptionBudget.spec is not empty:
The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`.
In all other cases the default podDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1.
With an Enterprise license and if podDisruptionBudget.spec is empty:
The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions
for certain roles according to the health status of the cluster.
Example:
All data roles (excluding frozen): allows disruptions only when the cluster is green.
All other roles: allows disruptions only when the cluster is yellow or green.
To disable, set `podDisruptionBudget` to the empty value (`{}` in YAML). | | *`auth`* __[Auth](#auth)__ | Auth contains user authentication and authorization security settings for Elasticsearch. | | *`secureSettings`* __[SecretSource](#secretsource) array__ | SecureSettings is a list of references to Kubernetes secrets containing sensitive configuration options for Elasticsearch. | | *`serviceAccountName`* __string__ | ServiceAccountName is used to check access from the current resource to a resource (for ex. a remote Elasticsearch cluster) in a different namespace.
Can only be used if ECK is enforcing RBAC on references. | diff --git a/hack/upgrade-test-harness/testdata/v2100/crds.yaml b/hack/upgrade-test-harness/testdata/v2100/crds.yaml index 241340ee41d..9aacfb6f092 100644 --- a/hack/upgrade-test-harness/testdata/v2100/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v2100/crds.yaml @@ -2543,7 +2543,7 @@ spec: minItems: 1 type: array podDisruptionBudget: - description: PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). + description: PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: description: ObjectMeta is the metadata of the PDB. The name and namespace provided here are managed by ECK and will be ignored. diff --git a/hack/upgrade-test-harness/testdata/v2111/crds.yaml b/hack/upgrade-test-harness/testdata/v2111/crds.yaml index 6d11e1aa2bb..d5157508e0f 100644 --- a/hack/upgrade-test-harness/testdata/v2111/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v2111/crds.yaml @@ -2718,7 +2718,7 @@ spec: minItems: 1 type: array podDisruptionBudget: - description: PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). + description: PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: description: ObjectMeta is the metadata of the PDB. The name and namespace provided here are managed by ECK and will be ignored. diff --git a/hack/upgrade-test-harness/testdata/v2121/crds.yaml b/hack/upgrade-test-harness/testdata/v2121/crds.yaml index 942e75015d6..9fad4e6ef84 100644 --- a/hack/upgrade-test-harness/testdata/v2121/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v2121/crds.yaml @@ -4456,7 +4456,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v2130/crds.yaml b/hack/upgrade-test-harness/testdata/v2130/crds.yaml index bfb1b0c6bef..58579fdd608 100644 --- a/hack/upgrade-test-harness/testdata/v2130/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v2130/crds.yaml @@ -4477,7 +4477,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v2140/crds.yaml b/hack/upgrade-test-harness/testdata/v2140/crds.yaml index 75be9d588d2..10e3eb19772 100644 --- a/hack/upgrade-test-harness/testdata/v2140/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v2140/crds.yaml @@ -4543,7 +4543,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v2150/crds.yaml b/hack/upgrade-test-harness/testdata/v2150/crds.yaml index c99dbb13989..6ce299a3e7e 100644 --- a/hack/upgrade-test-harness/testdata/v2150/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v2150/crds.yaml @@ -4498,7 +4498,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v2160/crds.yaml b/hack/upgrade-test-harness/testdata/v2160/crds.yaml index 290a0ca8b9d..6cd50fe9a96 100644 --- a/hack/upgrade-test-harness/testdata/v2160/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v2160/crds.yaml @@ -4498,7 +4498,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v2161/crds.yaml b/hack/upgrade-test-harness/testdata/v2161/crds.yaml index 7a180251109..41e338a12bd 100644 --- a/hack/upgrade-test-harness/testdata/v2161/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v2161/crds.yaml @@ -4498,7 +4498,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v300-stack9/crds.yaml b/hack/upgrade-test-harness/testdata/v300-stack9/crds.yaml index 574cf94f423..5c5dc5c30a6 100644 --- a/hack/upgrade-test-harness/testdata/v300-stack9/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v300-stack9/crds.yaml @@ -4498,7 +4498,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v300/crds.yaml b/hack/upgrade-test-harness/testdata/v300/crds.yaml index 574cf94f423..5c5dc5c30a6 100644 --- a/hack/upgrade-test-harness/testdata/v300/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v300/crds.yaml @@ -4498,7 +4498,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v310/crds.yaml b/hack/upgrade-test-harness/testdata/v310/crds.yaml index c5215fd943d..cce10c2f366 100644 --- a/hack/upgrade-test-harness/testdata/v310/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v310/crds.yaml @@ -4495,7 +4495,7 @@ spec: description: |- PodDisruptionBudget provides access to the default Pod disruption budget for the Elasticsearch cluster. The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default PodDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default PodDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. To disable, set `PodDisruptionBudget` to the empty value (`{}` in YAML). properties: metadata: diff --git a/hack/upgrade-test-harness/testdata/v320/crds.yaml b/hack/upgrade-test-harness/testdata/v320/crds.yaml index 0bff2107dfc..2f88c39e00a 100644 --- a/hack/upgrade-test-harness/testdata/v320/crds.yaml +++ b/hack/upgrade-test-harness/testdata/v320/crds.yaml @@ -4506,7 +4506,7 @@ spec: The behavior depends on the license level. With a Basic license or if podDisruptionBudget.spec is not empty: The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - In all other cases the default podDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + In all other cases the default podDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. With an Enterprise license and if podDisruptionBudget.spec is empty: The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions for certain roles according to the health status of the cluster. diff --git a/pkg/apis/elasticsearch/v1/elasticsearch_types.go b/pkg/apis/elasticsearch/v1/elasticsearch_types.go index edb148e0451..bcfdc9be3f4 100644 --- a/pkg/apis/elasticsearch/v1/elasticsearch_types.go +++ b/pkg/apis/elasticsearch/v1/elasticsearch_types.go @@ -107,7 +107,7 @@ type ElasticsearchSpec struct { // The behavior depends on the license level. // With a Basic license or if podDisruptionBudget.spec is not empty: // The default budget doesn't allow any Pod to be removed in case the cluster is not green or if there is only one node of type `data` or `master`. - // In all other cases the default podDisruptionBudget sets `minUnavailable` equal to the total number of nodes minus 1. + // In all other cases the default podDisruptionBudget sets `minAvailable` equal to the total number of nodes minus 1. // With an Enterprise license and if podDisruptionBudget.spec is empty: // The default budget is split into multiple budgets, each targeting a specific node role type allowing additional disruptions // for certain roles according to the health status of the cluster.