openshift / cluster-etcd-operator

Operator to manage the lifecycle of the etcd members of an OpenShift cluster
Apache License 2.0
95 stars 127 forks source link

[release-4.17] OCPBUGS-38454: prefer env var over hardcoding ciphers #1316

Closed openshift-cherrypick-robot closed 4 weeks ago

openshift-cherrypick-robot commented 1 month ago

This is an automated cherry-pick of #1314

/assign tjungblu

/cherrypick release-4.16 release-4.15 release-4.14 release-4.13

openshift-ci-robot commented 1 month ago

@openshift-cherrypick-robot: Jira Issue OCPBUGS-38341 has been cloned as Jira Issue OCPBUGS-38454. Will retitle bug to link to clone. /retitle [release-4.17] OCPBUGS-38454: prefer env var over hardcoding ciphers

In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1316): >This is an automated cherry-pick of #1314 > >/assign tjungblu > >/cherrypick release-4.16 release-4.15 release-4.14 release-4.13 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-etcd-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 1 month ago

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-38454, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1316): >This is an automated cherry-pick of #1314 > >/assign tjungblu > >/cherrypick release-4.16 release-4.15 release-4.14 release-4.13 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-etcd-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci[bot] commented 1 month ago

@openshift-cherrypick-robot: 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-aws-etcd-recovery cb8e5191a997ccc63e876c1cf7651762724f00fd link false /test e2e-aws-etcd-recovery
ci/prow/e2e-metal-ovn-sno-cert-rotation-shutdown cb8e5191a997ccc63e876c1cf7651762724f00fd link false /test e2e-metal-ovn-sno-cert-rotation-shutdown
ci/prow/e2e-aws-etcd-certrotation cb8e5191a997ccc63e876c1cf7651762724f00fd link false /test e2e-aws-etcd-certrotation
ci/prow/e2e-metal-ovn-ha-cert-rotation-shutdown cb8e5191a997ccc63e876c1cf7651762724f00fd link false /test e2e-metal-ovn-ha-cert-rotation-shutdown

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
dusk125 commented 1 month ago

/lgtm /label backport-risk-assessed

tjungblu commented 1 month ago

/jira refresh

openshift-ci-robot commented 1 month ago

@tjungblu: This pull request references Jira Issue OCPBUGS-38454, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1316#issuecomment-2292988211): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-etcd-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
tjungblu commented 1 month ago

/jira refresh

openshift-ci-robot commented 1 month ago

@tjungblu: This pull request references Jira Issue OCPBUGS-38454, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.17.0) matches configured target version for branch (4.17.0) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-38341](https://issues.redhat.com//browse/OCPBUGS-38341) is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED) * dependent [Jira Issue OCPBUGS-38341](https://issues.redhat.com//browse/OCPBUGS-38341) targets the "4.18.0" version, which is one of the valid target versions: 4.18.0 * bug has dependents

Requesting review from QA contact: /cc @geliu2016

In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1316#issuecomment-2310152121): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-etcd-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
geliu2016 commented 1 month ago

/lgtm

geliu2016 commented 1 month ago

/label qe-approved

openshift-ci-robot commented 1 month ago

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-38454, which is valid.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.17.0) matches configured target version for branch (4.17.0) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-38341](https://issues.redhat.com//browse/OCPBUGS-38341) is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED) * dependent [Jira Issue OCPBUGS-38341](https://issues.redhat.com//browse/OCPBUGS-38341) targets the "4.18.0" version, which is one of the valid target versions: 4.18.0 * bug has dependents

Requesting review from QA contact: /cc @geliu2016

In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1316): >This is an automated cherry-pick of #1314 > >/assign tjungblu > >/cherrypick release-4.16 release-4.15 release-4.14 release-4.13 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-etcd-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
geliu2016 commented 1 month ago

pre-merge-test with 4.17.0-0.ci.test-2024-08-27-035537-ci-ln-rtg49gt-latest

tjungblu commented 1 month ago

@geliu2016 can you CPA here please?

tjungblu commented 4 weeks ago

/retest-required

tjungblu commented 4 weeks ago

dunno if Ge is out today, @sandeepknd can you also add the CPA please?

openshift-ci[bot] commented 4 weeks ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dusk125, geliu2016, openshift-cherrypick-robot

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](https://github.com/openshift/cluster-etcd-operator/blob/release-4.17/OWNERS)~~ [dusk125] 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 commented 4 weeks ago

@openshift-cherrypick-robot: Jira Issue OCPBUGS-38454: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-38454 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/cluster-etcd-operator/pull/1316): >This is an automated cherry-pick of #1314 > >/assign tjungblu > >/cherrypick release-4.16 release-4.15 release-4.14 release-4.13 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-etcd-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-cherrypick-robot commented 4 weeks ago

@openshift-cherrypick-robot: #1316 failed to apply on top of branch "release-4.16":

Applying: OCPBUGS-38341: prefer env var over hardcoding ciphers
Using index info to reconstruct a base tree...
M   bindata/etcd/pod.yaml
M   pkg/operator/etcd_assets/bindata.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/etcd_assets/bindata.go
CONFLICT (content): Merge conflict in pkg/operator/etcd_assets/bindata.go
Auto-merging bindata/etcd/pod.yaml
CONFLICT (content): Merge conflict in bindata/etcd/pod.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-38341: prefer env var over hardcoding ciphers
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](): >This is an automated cherry-pick of #1314 > >/assign tjungblu > >/cherrypick release-4.16 release-4.15 release-4.14 release-4.13 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-bot commented 4 weeks ago

[ART PR BUILD NOTIFIER]

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