Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-43748: etcd pod containers do not start when tls min version is 1.3 #1364

Merged
merged 1 commit into from
Nov 26, 2024

Conversation

sanchezl
Copy link
Contributor

@sanchezl sanchezl commented Oct 31, 2024

  • add ETCD_TLS_MIN_VERSION env to etcd pods
  • add listen-tls-min-version flag to readyz cmd
  • do not start etcd with --cipher-suites with tls1.3

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 31, 2024
Copy link
Contributor

openshift-ci bot commented Oct 31, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@sanchezl sanchezl force-pushed the tls13 branch 3 times, most recently from 5f24eac to 7675d82 Compare November 14, 2024 05:33
@sanchezl sanchezl marked this pull request as ready for review November 14, 2024 05:33
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 14, 2024
@openshift-ci openshift-ci bot requested review from Elbehery and hasbro17 November 14, 2024 05:34
Comment on lines +346 to +348
// When --tls-min-version is set to 'TLS1.3', etcd does not allow --cipher-suites to also be specified.
// We still outout an env var for informational purposes.
envName = "CIPHER_SUITES"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha nice trick

@tjungblu
Copy link
Contributor

looks good to me, tests are failing though

@tjungblu
Copy link
Contributor

/lgtm

I think you just have to update the assertions to have the env var added

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 14, 2024
@sanchezl sanchezl changed the title TLS1.3 support OCPBUGS-43748: ensure tls min version and cipher suites specified on etcd pod containers Nov 19, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 19, 2024
@openshift-ci-robot
Copy link

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @geliu2016

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

In response to this:

  • add ETCD_TLS_MIN_VERSION env to etcd pods
  • add listen-tls-min-version flag to readyz cmd
  • do not start etcd with --cipher-suites with tls1.3

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.

@openshift-ci openshift-ci bot requested a review from geliu2016 November 19, 2024 13:59
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9a2aa20 and 2 for PR HEAD b2ec0b7 in total

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2024
@sanchezl sanchezl changed the title OCPBUGS-43748: ensure tls min version and cipher suites specified on etcd pod containers OCPBUGS-43748: etcd pod containers do not start when tls min version is 1.3 Nov 19, 2024
@tjungblu
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2024
Copy link
Contributor

openshift-ci bot commented Nov 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sanchezl, 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:

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
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9a2aa20 and 2 for PR HEAD c66a71f in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9a2aa20 and 2 for PR HEAD c66a71f in total

Copy link
Contributor

openshift-ci bot commented Nov 19, 2024

@sanchezl: 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/okd-scos-e2e-aws-ovn c66a71f link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-metal-ovn-ha-cert-rotation-shutdown c66a71f link false /test e2e-metal-ovn-ha-cert-rotation-shutdown
ci/prow/e2e-aws-etcd-recovery c66a71f link false /test e2e-aws-etcd-recovery
ci/prow/e2e-aws-etcd-certrotation c66a71f link false /test e2e-aws-etcd-certrotation
ci/prow/e2e-metal-ovn-sno-cert-rotation-shutdown c66a71f link false /test e2e-metal-ovn-sno-cert-rotation-shutdown

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.

@geliu2016
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 20, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD a053e7c and 2 for PR HEAD c66a71f in total

@openshift-merge-bot openshift-merge-bot bot merged commit 47b36cf into openshift:master Nov 26, 2024
13 of 18 checks passed
@openshift-ci-robot
Copy link

@sanchezl: Jira Issue OCPBUGS-43748: All pull requests linked via external trackers have merged:

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

In response to this:

  • add ETCD_TLS_MIN_VERSION env to etcd pods
  • add listen-tls-min-version flag to readyz cmd
  • do not start etcd with --cipher-suites with tls1.3

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

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

@wangke19
Copy link

/cherry-pick release-4.18

@openshift-cherrypick-robot

@wangke19: #1364 failed to apply on top of branch "release-4.18":

Applying: ensure etcd starts when using TLS1.3
Using index info to reconstruct a base tree...
M	bindata/etcd/pod.gotpl.yaml
M	pkg/etcdenvvar/envvarcontroller_test.go
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 pkg/etcdenvvar/envvarcontroller_test.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 ensure etcd starts when using TLS1.3

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants