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

Manual sync of upstream release-1.14 into master #608

Closed
wants to merge 12 commits into from

Conversation

Nikhil-Ladha
Copy link
Member

Manual sync of upstream release-1.14 into master.

Checklist:

  • Commit Message Formatting: Commit titles and messages follow guidelines in the developer guide.
  • Reviewed the developer guide on Submitting a Pull Request
  • Pending release notes updated with breaking and/or notable changes for the next minor release.
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.

subhamkrai and others added 11 commits March 27, 2024 10:34
Few day's back go 1.22 is release. Let's add that
as valid version to build on. Also, adding 1.22 as
test matric for linux build CI.

https://tip.golang.org/doc/go1.22

Signed-off-by: subhamkrai <[email protected]>
v2 port can be avalaible without v1,
so fixing the current check

Signed-off-by: parth-gr <[email protected]>
we need to update the operator configmap
to get enable the topology provisioning

Signed-off-by: parth-gr <[email protected]>
csi pr get merged ceph/ceph-csi#4459
so, This reverts commit 812a9c0.
The csi PR removes the dependency of the pool parameter from the
rbd storage class if the topology pools are passed,
so removing them in the examples and making it optional

Signed-off-by: parth-gr <[email protected]>
external: remove replicated 3 pool for the rbd sc
doc: update the topology document for external mode
external: fix v2 port check in external script
For the new release branch update the examples and docs
to v1.14.0-beta.0.

Signed-off-by: Travis Nielsen <[email protected]>
build: Update the release version to v1.14.0-beta.0
Copy link

openshift-ci bot commented Mar 28, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Nikhil-Ladha

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

@Nikhil-Ladha
Copy link
Member Author

Since, we have older commits coming into history there is a merge commit that we have to keep.

add generated changes for version bump

Signed-off-by: Nikhil-Ladha <[email protected]>
Copy link

@travisn travisn left a comment

Choose a reason for hiding this comment

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

Let's discuss... We shouldn't sync from 1.14 to downstream master.

@Nikhil-Ladha
Copy link
Member Author

Closing it out on the basis of offline discussion.

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.

4 participants