Skip to content

[release-5.0] OCPBUGS-114671: fall back to intermediate ciphers during etcd bootstrap - #1690

Open
openshift-cherrypick-robot wants to merge 2 commits into
openshift:release-5.0from
openshift-cherrypick-robot:cherry-pick-1689-to-release-5.0
Open

[release-5.0] OCPBUGS-114671: fall back to intermediate ciphers during etcd bootstrap#1690
openshift-cherrypick-robot wants to merge 2 commits into
openshift:release-5.0from
openshift-cherrypick-robot:cherry-pick-1689-to-release-5.0

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #1689

/assign openshift-ci-robot

During bootstrap the EnvVarController reads servingInfo.cipherSuites from
the operator's observedConfig, but the config observer cannot populate it
until the control plane is running - and etcd cannot start until this
controller produces ETCD_CIPHER_SUITES. Until now getCipherSuites()
hard-errored on the empty observedConfig, setting EnvVarControllerDegraded
and blocking the first etcd revision (StaticPodsAvailable: 0 nodes are
active; 3 nodes are at revision 0). On slower platforms (e.g. the gcd
sovereign-cloud region) this convergence race can exceed the installer's
45-minute bootstrap window, causing intermittent install failures.

Break the chicken-and-egg deadlock by falling back, only at bootstrap
(LatestAvailableRevision == 0), to the same TLSProfileIntermediateType
ciphers the render path bakes into the bootstrap etcd member
(pkg/cmd/render/env.go:getTLSCipherSuites). The fallback is
cryptographically identical to the cipher set the bootstrap etcd is
already running, and is self-correcting: once observedConfig converges the
observed ciphers take over. Past bootstrap (revision > 0) an empty
observedConfig remains a genuine convergence failure and still surfaces as
degraded.

The previously merged mitigation (openshift#1659, adding the APIServer informer to
the EnvVarController cache sync) only waits for the informer cache to sync,
not for the config observer to populate observedConfig, so the race
persisted on slow environments; this change addresses the root cause.

Assisted-By: Claude Opus 4.8
Signed-off-by: Mat Kowalski <mko@redhat.com>
Address two review findings on the bootstrap cipher-suites fallback:

1. Restore the original getCipherSuites error string ("no supported
   cipherSuites not found in observedConfig"). The earlier reword broke the
   EtcdBootstrapRev0CipherSuitesOCPBUGS94106 CI symptom matcher and was
   unrelated to the fix.

2. Replace the imprecise "LatestAvailableRevision == 0" bootstrap check with
   bootstrap.IsBootstrapComplete (the kube-system/bootstrap configmap), the
   same idiom used by the etcdcertsigner/bootstrapteardown/etcdendpoints
   controllers. LatestAvailableRevision can read 0 outside a fresh install
   (Etcd CR delete/recreate, DR restore, status reset); gating on it risked
   silently downgrading an established cluster's configured ciphers to the
   intermediate profile. The configmap signal only allows the fallback while
   bootstrap is genuinely in progress, and covers the whole bootstrap phase
   rather than just revision 0.

Wire a kube-system configmap lister/informer into the EnvVarController for the
check. Tests: drive TestGetCipherSuites via the bootstrap configmap state and
assert the restored error string; add a TestEnvVarController bootstrap scenario
proving sync() does not degrade when observedConfig is empty during bootstrap.

Assisted-By: Claude Opus 4.8
Signed-off-by: Mat Kowalski <mko@redhat.com>
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-94106 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-5.0] OCPBUGS-114671: fall back to intermediate ciphers during etcd bootstrap

Details

In response to this:

This is an automated cherry-pick of #1689

/assign openshift-ci-robot

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.

@coderabbitai

coderabbitai Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: a9275b19-3a22-4aba-b841-54052477ef16

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@openshift-ci openshift-ci Bot changed the title [release-5.0] OCPBUGS-94106: fall back to intermediate ciphers during etcd bootstrap [release-5.0] OCPBUGS-114671: fall back to intermediate ciphers during etcd bootstrap Aug 27, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 27, 2026
@openshift-ci-robot

Copy link
Copy Markdown

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

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-94106 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is POST instead

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.

Details

In response to this:

This is an automated cherry-pick of #1689

/assign openshift-ci-robot

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

Copy link
Copy Markdown
Contributor

/label backport-risk-assessed
/lgtm
/approve

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 31, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 31, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-agnostic-ovn
/test e2e-agnostic-ovn-upgrade
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-single-node
/test e2e-gcp-operator
/test e2e-gcp-operator-disruptive
/test e2e-metal-ipi-ovn-ipv6
/test e2e-operator

@openshift-ci

openshift-ci Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tjungblu

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

The pull request process is described here

Details 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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 31, 2026
@openshift-ci

openshift-ci Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/invalid-bug Indicates that a referenced Jira bug is invalid 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.

4 participants