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

Stabilise openshift 4.15 spec & add openshift 4.16-experimental spec #514

Merged
merged 7 commits into from
Feb 19, 2024

Conversation

travier
Copy link
Member

@travier travier commented Feb 16, 2024

docs: Fix openshift v4.14 generated docs

Fixes: 186b8e8


openshift/v4.15: Stabilize 4.15.0 spec


openshift/v4.15: Use fcos 1.5 & ignition 3.4 specs

Stabilise openshift 4.14.0 spec on fcos 1.5 and ignition 3.4 stable
specs. fcos 1.6 & ignition 3.5 are still experimental.


internal/doc/butane: Fix whitespace

Fixes: 0d2fa0f spec/v1.6: Add support for boot_device sugar on s390x


openshift/v4.15: Remove GRUB password support


openshift/v4_16_exp: Add 4.16.0-experimental spec

--

Fixes: #511
Based on #513 for convenience.

@travier
Copy link
Member Author

travier commented Feb 16, 2024

See also #515

Copy link
Contributor

@prestist prestist left a comment

Choose a reason for hiding this comment

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

Overall, its looks good, and thank you for doing this.

I have a few small picks about the structuring of your commits, it would help readability for me. Not sure if it's a nessary change though.

Looking at your commit structure
[docs: Fix openshift v4.14 generated docs]
[docs: Mark grub section as unsupported]
[internal/doc/butane: Fix whitespace]
[openshift/v4.15: Stabilize 4.15.0 spec]
[openshift/v4.15: Use fcos 1.5 & ignition 3.4 specs]
[openshift/v4.15: Remove GRUB password support]
[openshift/v4_16_exp: Add 4.16.0-experimental spec]

I think it would be better to be
[docs: Fix openshift v4.14 generated docs] ++ [docs: Mark grub section as unsupported]
[internal/doc/butane: Fix whitespace]
[openshift/v4_15_exp: rename to v4_16_exp]
[openshift/v4_15: copy from v4_16_exp]
[Stabilize openshift 4.15.0; create openshift 4.16.0-experimental]
[openshift/v4.15: Remove GRUB password support]

wdyt?

@prestist
Copy link
Contributor

Also nit Stabilize not Stabilise just because past pr's tend to use Stabilize

Copy link
Contributor

@prestist prestist left a comment

Choose a reason for hiding this comment

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

As there are not any changes that must happen to merge, and there is a timeline. Lets merge as is.
LGTM

@prestist prestist merged commit 6aab650 into coreos:main Feb 19, 2024
7 checks passed
@travier travier deleted the main-openshift-4.15-stable branch February 20, 2024 09:00
@travier
Copy link
Member Author

travier commented Feb 20, 2024

I followed the steps from #511. Maybe we could revisit them at some later time. I don't have the full context for the order but I can see some logic behind it (mostly to avoid mistakes).

travier added a commit to travier/butane that referenced this pull request Feb 20, 2024
travier added a commit to travier/butane that referenced this pull request Feb 20, 2024
yasminvalim pushed a commit to yasminvalim/butane that referenced this pull request Mar 15, 2024
@travier travier mentioned this pull request May 28, 2024
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Stabilize openshift v4.15.0 spec
2 participants