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.

Sign up for GitHub

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

Jump to bottom

OSASINFRA-3243: add ephemeral storage support #88

Merged
merged 3 commits into from Oct 31, 2023
Merged

OSASINFRA-3243: add ephemeral storage support #88

merged 3 commits into from Oct 31, 2023

Conversation

EmilienM
Copy link
Member

@EmilienM EmilienM commented Oct 18, 2023 •
edited

Allow to use the new AdditionalBlockDevices in OpenShift machines.

@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 Oct 18, 2023
@EmilienM
Copy link
Member Author

/test e2e-openstack

@EmilienM
Copy link
Member Author

/retest-required

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 19, 2023
@EmilienM
Copy link
Member Author

/test e2e-openstack

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 20, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 20, 2023
@EmilienM EmilienM force-pushed the etcd_bd branch 2 times, most recently from 2cfff0b to 99f6a97 Compare October 21, 2023 01:57
@EmilienM EmilienM changed the title DNM - used for testing etcd block device early OSASINFRA-3243: WIP - used for testing etcd block device early Oct 24, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 24, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 24, 2023 •
edited by openshift-ci bot

@EmilienM: This pull request references OSASINFRA-3243 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

In response to this:

DO NOT REVIEW - IGNORE IT - I'm using it for testing purpose.

  • [vendoring] update CAPO
  • [vendoring] update CAPI
  • [vendoring] update machine-api-operator
  • Adjustements for new controller-runtime
  • Move to CAPO v1alpha7
  • [vendoring] use CAPO fork with ephemeral disks support
  • [vendoring] update openshift/api to using fork
  • Add AdditionalBlockDevices support

/hold

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/test-infra repository.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 24, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 27, 2023
@EmilienM EmilienM changed the title OSASINFRA-3243: WIP - used for testing etcd block device early OSASINFRA-3243: WIP - add ephemeral storage support Oct 27, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 27, 2023 •
edited by openshift-ci bot

@EmilienM: This pull request references OSASINFRA-3243 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

In response to this:

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/test-infra repository.

@EmilienM EmilienM changed the title OSASINFRA-3243: WIP - add ephemeral storage support OSASINFRA-3243: add ephemeral storage support Oct 30, 2023
@EmilienM
Copy link
Member Author

EmilienM commented Oct 30, 2023 •
edited

@mandre should we get a new tag in downstream CAPO? I pulled it from the main branch, I don't think we want that.
If yes, please produce one or let me know to do it. Thanks

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Oct 30, 2023 •
edited by openshift-ci bot

@EmilienM: This pull request references OSASINFRA-3243 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

In response to this:

Allow to use the new AdditionalBlockDevices in OpenShift machines.

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/test-infra repository.

@EmilienM EmilienM mentioned this pull request Oct 30, 2023
Merged
@MaysaMacedo
Copy link
Contributor

/lgtm
/hold waiting for Martin's reply

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 30, 2023
@MaysaMacedo
Copy link
Contributor

/hold

@MaysaMacedo
Copy link
Contributor

/lgtm cancel

holds are not being enforced

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 30, 2023
@MaysaMacedo
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 30, 2023
mandre
mandre reviewed Oct 31, 2023
View reviewed changes
go.mod
@@ -120,5 +120,5 @@ require (
replace (
github.com/elazarl/goproxy => github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.2
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.8.0
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.8.0-beta.0.0.20231030165925-6fdfd82f7ad4
Copy link
Member

Choose a reason for hiding this comment

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

@mandre should we get a new tag in downstream CAPO? I pulled it from the main branch, I don't think we want that.

I theory we want the next OCP branch to be based on a stable version of CAPO but we can't really do that here, unless upstream releases a new stable version containing the additional storage changes before our feature freeze. Our choices are:

  • base OCP 4.15 on an unreleased version of CAPO (future v0.9.0, currently main) and benefit from new features like additional storage, at the expense of potentially higher maintaining cost.
  • base OCP 4.15 on the last stable CAPO version and forget about new features.

We'll have to go with the dev-branch in 4.15 because we need the new features. We can switch it to the stable v0.9.0 once it is released.

The fact that it is now showing v0.8.0-beta.0.0.20231030165925-6fdfd82f7ad4 here is because the last known tag commit in main was v0.8.0-beta. Strangely, the v0.8.0 tag (commit 686923cc1a8f45490b1c96b4a8bbb2e556be3627) doesn't belong in release-0.8 branch, so pulling release-0.8 would have had the same result:

~/go/src/sigs.k8s.io/cluster-api-provider-openstack remotes/k8s/release-0.8
❯ git describe                                                  
v0.8.0-beta.0-11-gaf788a6b2

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2023
mandre
mandre reviewed Oct 31, 2023
View reviewed changes
Copy link
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

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

Thanks.
/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 31, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM, mandre

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

@EmilienM
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2023
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Oct 31, 2023

@EmilienM: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

@openshift-ci openshift-ci bot merged commit c650e43 into openshift:master Oct 31, 2023
9 checks passed
@EmilienM EmilienM deleted the etcd_bd branch October 31, 2023 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mandre mandre mandre left review comments

Assignees

@mandre mandre

@MaysaMacedo MaysaMacedo

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@EmilienM @openshift-ci-robot @MaysaMacedo @mandre @openshift-merge-robot