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

Syncing latest changes from devel for ceph-csi #311

Closed
wants to merge 31 commits into from

Conversation

df-build-team
Copy link

PR containing the latest commits from devel branch

openshift-merge-bot bot and others added 9 commits May 23, 2024 09:05
Syncing latest changes from upstream devel for ceph-csi
ensure a clean and isolated environment for testing purposes.

Signed-off-by: Mayank Pal <[email protected]>

ci: Use temporary directory for unit tests

remove err = os.Mkdir('/etc/ceph-csi-config', 0o600)

Signed-off-by: Mayank Pal <[email protected]>

ci: Use temporary directory for unit tests

remove err = os.Mkdir('/etc/ceph-csi-config', 0o600)

Signed-off-by: Mayank Pal <[email protected]>

ci: Use temporary directory for unit tests

remove if err

Signed-off-by: Mayank Pal <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
Signed-off-by: guoguangwu <[email protected]>
k8s 1.30 tests were excluded for release-v3.11 but
merigfy had 1.30 tests conditions for release-v3.11.
This commit remove the these conditions for v3.11.

Signed-off-by: Praveen M <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
rebase: update kubernetes to 1.30

Signed-off-by: Praveen M <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
@openshift-merge-robot
Copy link

PR needs rebase.

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.

iPraveenParihar and others added 10 commits June 5, 2024 09:51
Since CentOS Stream 8 is EOL, this commit updates the
config to use vault.centos.org for CentOS Stream 8.
This should be removed once the base image (ceph) is
updated to a version with a newer CentOS.

Signed-off-by: Praveen M <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
Bumps the k8s-dependencies group with 1 update in the / directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).


Updates `sigs.k8s.io/controller-runtime` from 0.18.2 to 0.18.3
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.2...v0.18.3)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Errors like "pod nfs-820 does not have a host assigned" seem to get
reported when a Pod is not completely started yet, or was restarted
while trying to access it.

Reported: ceph#4656 (comment)
Signed-off-by: Niels de Vos <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
This commit resets PendingReleaseNotes.md and
points it to release v3.12.0.

Signed-off-by: Rakshith R <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
pod-level security contexts for nodeplugin daemonset and provisioner
deployment can be set via helm values.yaml

Signed-off-by: 1602077 <[email protected]>
Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).


Updates `sigs.k8s.io/controller-runtime` from 0.18.3 to 0.18.4
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.3...v0.18.4)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
@nixpanic
Copy link
Member

@Nikhil-Ladha this sync PR is not going very well. I am not sure what the cause could be, nor do I know how to correct it. Do you have a suggestion what to do about it?

openshift-merge-bot bot and others added 6 commits June 11, 2024 12:27
Syncing latest changes from upstream devel for ceph-csi
Bumps the golang-dependencies group with 3 updates: [golang.org/x/crypto](https://github.com/golang/crypto), [golang.org/x/net](https://github.com/golang/net) and [golang.org/x/sys](https://github.com/golang/sys).


Updates `golang.org/x/crypto` from 0.23.0 to 0.24.0
- [Commits](golang/crypto@v0.23.0...v0.24.0)

Updates `golang.org/x/net` from 0.25.0 to 0.26.0
- [Commits](golang/net@v0.25.0...v0.26.0)

Updates `golang.org/x/sys` from 0.20.0 to 0.21.0
- [Commits](golang/sys@v0.20.0...v0.21.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-dependencies
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-dependencies
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
This commit replaces codes.Unknown with codes.Internal
as the default error code in getGRPCError().

Signed-off-by: Rakshith R <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
Bumps [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/Azure/azure-sdk-for-go/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md)
- [Commits](Azure/azure-sdk-for-go@sdk/internal/v1.5.1...sdk/azcore/v1.6.0)

---
updated-dependencies:
- dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
iPraveenParihar and others added 6 commits June 13, 2024 10:08
Below sidecars are updated with latest available versions

csi-node-driver-registrar: v2.10.1
csi-resizer: v1.11.1
csi-provisioner: v5.0.1
csi-attacher: v4.6.1
csi-snapshotter: v8.0.1

Signed-off-by: Praveen M <[email protected]>
This commit remove `VOLUME_ACCESSIBILITY_CONSTRAINTS` capabilities
from CephFS as topology based volume provisioning is not yet supported.

Signed-off-by: Praveen M <[email protected]>
This commit removes the Topology feature gate as it is now enabled by default
and will be removed in a future release. It is CSI driver's responsibility to
report capability `VOLUME_ACCESSIBILITY_CONSTRAINTS` so that topology gets
enabled in external-provisioner. When driver doesn't report it,
external-provisioner disables topology support.

As of this change, Only RBD driver supports topology based volume provisioning
and it reports the `VOLUME_ACCESSIBILITY_CONSTRAINTS` capability,
enabling topology support in the external-provisioner.

Signed-off-by: Praveen M <[email protected]>
This commit removes the Topology feature gate as it is now enabled
by default and will be removed in a future release.

Signed-off-by: Praveen M <[email protected]>
This commit removes `enableTopologyInTemplate` method as this is not
needed anymore.

Signed-off-by: Praveen M <[email protected]>
Syncing latest changes from upstream devel for ceph-csi
@Nikhil-Ladha
Copy link
Member

Seems like this has to be manually resolved, I don't think there is any other option.
Probably, a one time manual sync is needed and then the auto PR can do the syncing later on.

@openshift-ci openshift-ci bot added the lgtm Code looks good label Jun 20, 2024
@Madhu-1 Madhu-1 closed this Jun 20, 2024
Copy link

openshift-ci bot commented Jun 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: df-build-team, Madhu-1

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

@openshift-ci openshift-ci bot added the approved Its a good idea label Jun 20, 2024
@Madhu-1
Copy link
Member

Madhu-1 commented Jun 20, 2024

Seems like this has to be manually resolved, I don't think there is any other option. Probably, a one time manual sync is needed and then the auto PR can do the syncing later on.

@Nikhil-Ladha i did try to push rebase Pr for 4.17, it looks like i don't have any problem in local branch but its having merge conflict here any idea?
cc @nixpanic

@Nikhil-Ladha
Copy link
Member

I just tried this one and it shows conflict #320

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Its a good idea lgtm Code looks good needs-rebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants