ETCD-677: add unsupported config override for etcd container removal

[tjungblu]

/hold

for testing purposes in 2NO

[openshift-ci-robot]

@tjungblu: This pull request references ETCD-677 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

/hold

for testing purposes in 2NO

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 openshift-eng/jira-lifecycle-plugin repository.

[tjungblu]

/cherry-pick release-4.18

[openshift-cherrypick-robot]

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

In response to this:

/cherry-pick release-4.18

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-sigs/prow repository.

[tjungblu]

/hold cancel

[hasbro17]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hasbro17, tjungblu

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 [hasbro17,tjungblu]

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

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 47b36cf and 2 for PR HEAD 87714bf in total

[tjungblu]

/retest-required

[openshift-ci]

@tjungblu: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-metal-ovn-sno-cert-rotation-shutdown	87714bf	link	false	/test e2e-metal-ovn-sno-cert-rotation-shutdown
ci/prow/e2e-aws-etcd-certrotation	87714bf	link	false	/test e2e-aws-etcd-certrotation
ci/prow/e2e-metal-ovn-ha-cert-rotation-shutdown	87714bf	link	false	/test e2e-metal-ovn-ha-cert-rotation-shutdown
ci/prow/e2e-operator-fips	87714bf	link	false	/test e2e-operator-fips
ci/prow/e2e-aws-etcd-recovery	87714bf	link	false	/test e2e-aws-etcd-recovery

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

[tjungblu]

/override ci/prow/e2e-aws-ovn-etcd-scaling

[openshift-ci]

@tjungblu: Overrode contexts on behalf of tjungblu: ci/prow/e2e-aws-ovn-etcd-scaling

In response to this:

/override ci/prow/e2e-aws-ovn-etcd-scaling

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-sigs/prow repository.

[openshift-cherrypick-robot]

@tjungblu: #1352 failed to apply on top of branch "release-4.18":

Applying: ETCD-677: add unsupported config override for etcd container removal
Using index info to reconstruct a base tree...
M	bindata/etcd/pod.gotpl.yaml
M	pkg/operator/etcd_assets/bindata.go
M	pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/targetconfigcontroller/targetconfigcontroller.go
CONFLICT (content): Merge conflict in pkg/operator/targetconfigcontroller/targetconfigcontroller.go
Auto-merging pkg/operator/etcd_assets/bindata.go
Auto-merging bindata/etcd/pod.gotpl.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 ETCD-677: add unsupported config override for etcd container removal

In response to this:

/cherry-pick release-4.18

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-sigs/prow repository.

[openshift-bot]

[ART PR BUILD NOTIFIER]

Distgit: cluster-etcd-operator
This PR has been included in build cluster-etcd-operator-container-v4.19.0-202412031609.p0.g658cb7e.assembly.stream.el9.
All builds following this will include this PR.