LOG-1524: Fix full cluster cert redeploy with non-data nodes

[periklis]

Description

The following change set provides a fix for the full cluster redeploy scenario with non-data ES nodes. The cause of this bug is that the elasticsearch-operator is using the wrong CR spec when updating the replica count to zero. This causes a full cluster redeploy being stuck in the scale down step forever. In turn no full cluster redeploy completes and leaves the ES cluster in an unhealthy state.

/cc @ewolinetz
/assign @ewolinetz

/cherry-pick release-5.1
/cherry-pick release-5.0

Links

• JIRA: https://issues.redhat.com/browse/LOG-1524

[ewolinetz]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ewolinetz, periklis

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [ewolinetz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[ewolinetz]

/cherry-pick release-5.1
/cherry-pick release-5.0
/cherry-pick release-4.6

[openshift-cherrypick-robot]

@ewolinetz: once the present PR merges, I will cherry-pick it on top of release-5.1 in a new PR and assign it to you.

In response to this:

/cherry-pick release-5.1
/cherry-pick release-5.0
/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[ewolinetz]

/cherry-pick release-5.0

[openshift-cherrypick-robot]

@ewolinetz: once the present PR merges, I will cherry-pick it on top of release-5.0 in a new PR and assign it to you.

In response to this:

/cherry-pick release-5.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[ewolinetz]

/cherry-pick release-4.6

[openshift-cherrypick-robot]

@ewolinetz: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@ewolinetz: new pull request created: #741

In response to this:

/cherry-pick release-5.1
/cherry-pick release-5.0
/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@ewolinetz: #740 failed to apply on top of branch "release-5.0":

Applying: Fix full cluster cert redeploy with non-data nodes
Using index info to reconstruct a base tree...
M	internal/k8shandler/deployment.go
M	internal/k8shandler/statefulset.go
M	test/e2e-olm/elasticsearch_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e-olm/elasticsearch_test.go
CONFLICT (content): Merge conflict in test/e2e-olm/elasticsearch_test.go
Auto-merging internal/k8shandler/statefulset.go
Auto-merging internal/k8shandler/deployment.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix full cluster cert redeploy with non-data nodes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-5.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@ewolinetz: #740 failed to apply on top of branch "release-4.6":

Applying: Fix full cluster cert redeploy with non-data nodes
Using index info to reconstruct a base tree...
A	internal/k8shandler/deployment.go
A	internal/k8shandler/statefulset.go
M	test/e2e-olm/elasticsearch_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e-olm/elasticsearch_test.go
CONFLICT (content): Merge conflict in test/e2e-olm/elasticsearch_test.go
Auto-merging pkg/k8shandler/statefulset.go
Auto-merging pkg/k8shandler/deployment.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix full cluster cert redeploy with non-data nodes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.