Skip to content

bootstrap: Pass rendered manifests and payload version to etcd render#10679

Open
sanchezl wants to merge 1 commit into
openshift:mainfrom
sanchezl:etcd-render-featuregate
Open

bootstrap: Pass rendered manifests and payload version to etcd render#10679
sanchezl wants to merge 1 commit into
openshift:mainfrom
sanchezl:etcd-render-featuregate

Conversation

@sanchezl

@sanchezl sanchezl commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

Summary

Add --rendered-manifest-files and --payload-version flags to the etcd-render invocation in bootkube.sh so the cluster-etcd-operator render command can read the FeatureGate CR from pre-rendered manifests.

Background

The api-render step already runs before etcd-render and produces the fully-resolved FeatureGate CR (with featureSet expanded into individual gates) in /assets/manifests/. The etcd-render step was the only operator render that didn't consume these manifests — it parsed feature gates from the raw install-config instead, which missed featureSet resolution.

This aligns the etcd-render invocation with the pattern already used by kube-apiserver-render, kube-controller-manager-render, and config-render, all of which pass --rendered-manifest-files=/assets/manifests and --payload-version=$VERSION.

Coordinated change

Requires openshift/cluster-etcd-operator#1648 to accept the new flags. Both PRs must land in the same payload.

Test plan

  • CI with coordinated CEO PR

Summary by CodeRabbit

  • Bug Fixes
    • Improved cluster bootstrap rendering by supplying the required manifest output location and payload version.
    • Preserved network configuration handling during etcd setup.

Add --rendered-manifest-files and --payload-version flags to the
etcd-render invocation in bootkube.sh so the cluster-etcd-operator
render command can read the FeatureGate CR from pre-rendered manifests
instead of parsing feature gates from the raw install-config.

The api-render step already runs before etcd-render and produces the
fully-resolved FeatureGate CR in /assets/manifests/, so the manifests
are guaranteed to be available.

This aligns etcd-render with the pattern used by kube-apiserver-render,
kube-controller-manager-render, and config-render, all of which already
pass these flags.

Requires a coordinated cluster-etcd-operator change to accept the new
flags.
@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

@coderabbitai

coderabbitai Bot commented Jul 10, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: d645655f-04bb-4552-b805-1015a490b872

📥 Commits

Reviewing files that changed from the base of the PR and between dcad02a and 6be6565.

📒 Files selected for processing (1)
  • data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

📝 Walkthrough

Walkthrough

The etcd bootstrap script now passes a rendered-manifest destination and payload version to cluster-etcd-operator render, while retaining the network configuration argument.

Changes

Etcd bootstrap rendering

Layer / File(s) Summary
Render command inputs
data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
The cluster-etcd-operator render invocation now includes /assets/manifests as the rendered manifest path and $VERSION as the payload version, alongside the network configuration file.

Estimated code review effort: 2 (Simple) | ~10 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: passing rendered manifests and payload version to the etcd render step.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The patch only edits a shell template; no Ginkgo test titles or test files were added or changed.
Test Structure And Quality ✅ Passed The PR only changes bootkube.sh.template; no Ginkgo tests were added or modified, so the test-quality criteria are not applicable.
Microshift Test Compatibility ✅ Passed Only bootkube.sh.template changed; no new or modified Ginkgo tests are present.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only bootkube.sh.template changed; no new Ginkgo It/Describe/Context/When tests or SNO assumptions were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only render flags were added to bootkube.sh; no pod affinity, topology spread, nodeSelectors, replicas, or tolerations were introduced.
Ote Binary Stdout Contract ✅ Passed Only a bootkube shell template changed; no OTE binary process-level code or stdout writes were introduced.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only bootkube.sh.template changed; no Ginkgo tests or network-facing test code were added.
No-Weak-Crypto ✅ Passed Touched diff only adds etcd-render flags; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret compares found.
Container-Privileges ✅ Passed PR only adds render flags in bootkube.sh.template; no privileged/container security fields are introduced or modified.
No-Sensitive-Data-In-Logs ✅ Passed The diff only adds render flags; it introduces no new echo/printf/debug output or secret-bearing log data.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot requested review from jhixson74 and rna-afk July 10, 2026 02:52
@openshift-ci

openshift-ci Bot commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign pawanpinjarkar for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

@sanchezl: 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.

@tthvo

tthvo commented Jul 13, 2026

Copy link
Copy Markdown
Member

/cc
/hold

openshift/cluster-etcd-operator#1648 must go in first before we can test and merge this change. Otherwise, bootkube may fail with unknown operator render flags.

@openshift-ci openshift-ci Bot requested a review from tthvo July 13, 2026 22:52
@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 13, 2026
@tthvo

tthvo commented Jul 13, 2026

Copy link
Copy Markdown
Member

/cc @patrickdillon @hasbro17

@openshift-ci openshift-ci Bot requested review from hasbro17 and patrickdillon July 13, 2026 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants