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 syncing from red-hat-storage/ceph-csi:devel into release-4.16 #281

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
328e4e5
rebase: bump the github-dependencies group with 2 updates
dependabot[bot] Feb 26, 2024
f7d1efe
DOWNSTREAM-ONLY: update ceph-csi-team OWNER alias
nixpanic Mar 4, 2024
a07c96e
Merge pull request #266 from nixpanic/ds/update-team
openshift-merge-bot[bot] Mar 4, 2024
b8ab1c8
rebase: bump google.golang.org/grpc from 1.61.1 to 1.62.0
dependabot[bot] Feb 26, 2024
2368df7
cephfs: return `ErrBadAuth` during keyFn retry
mgfritch Feb 26, 2024
3410687
cephfs: create a new blank key sized according to the passphrase
mgfritch Feb 26, 2024
69e2159
Merge pull request #267 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 7, 2024
f12b606
rebase: bump the golang-dependencies group with 4 updates
dependabot[bot] Mar 7, 2024
e23d97d
Merge pull request #268 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 8, 2024
5298762
rebase: bump github.com/go-jose/go-jose/v3 from 3.0.1 to 3.0.3
dependabot[bot] Mar 7, 2024
3833f07
Merge pull request #269 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 12, 2024
c90f7ed
cleanup: use latest version for k8s.io/pod-security-admission
nixpanic Mar 8, 2024
e345b26
cleanup: refactor functions to accept a context parameter
iPraveenParihar Mar 4, 2024
65954fa
rebase: bump golang.org/x/oauth2 in /actions/retest
dependabot[bot] Mar 11, 2024
948d5e0
rebase: bump the github-dependencies group in /api with 1 update
dependabot[bot] Mar 4, 2024
fcaac58
helm: Include seLinuxMount only if KubeVersion greater or equal of 1.25
dragoangel Mar 5, 2024
d1cc483
Merge pull request #272 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 13, 2024
d93c755
rebase: bump google.golang.org/grpc from 1.62.0 to 1.62.1
dependabot[bot] Mar 11, 2024
8901b45
kms: Implement Azure key vault as KMS provider
iPraveenParihar Feb 16, 2024
b2087e4
doc: added docs for Azure KMS
iPraveenParihar Feb 20, 2024
47b2025
rebase: Azure key vault module dependency update
iPraveenParihar Feb 21, 2024
6c43789
doc: Update capabilities readme to solve to open permissions
dragoangel Mar 3, 2024
35da67b
vendor: include k8s.io/api/rbac/v1
nixpanic Jan 26, 2024
6b13352
api: add CSIProvisionerRBAC functions for the NFS-provisioner
nixpanic Jan 26, 2024
a6466fb
build: add NFS provisioner RBAC to generated artifacts
nixpanic Jan 26, 2024
1cb2ccd
rebase: update vendored Ceph-CSI API
nixpanic Jan 26, 2024
9276aeb
rebase: bump google.golang.org/protobuf in /actions/retest
dependabot[bot] Mar 13, 2024
32de268
cleanup: don't return an internal type from VolumeGroupJournal.Connect()
nixpanic Mar 12, 2024
a469a66
e2e: replace quoted namespace in templates too
nixpanic Mar 14, 2024
6f0d9a5
deploy: include ServiceAccount in the NFS provisioner RBAC artifact
nixpanic Mar 14, 2024
4f04748
rbd: support nbd on euler or arm
Nov 28, 2023
c32dfc0
cleanup: correct typo in `NewCSIVolumeroupJournal()` function
nixpanic Mar 14, 2024
991343d
cleanup: do not pass EncodingVersion to `GenerateVolID()`
nixpanic Mar 14, 2024
de17a0d
Merge pull request #273 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 18, 2024
bd07dd4
rbd: deployment changes to support VGS
iPraveenParihar Mar 14, 2024
b9543d3
helm: update template for rbd volumegroupsnapshot
iPraveenParihar Mar 14, 2024
cc5da5d
Merge pull request #274 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 19, 2024
5b9730c
rebase: bump the k8s-dependencies group with 1 update
dependabot[bot] Mar 18, 2024
3ad922d
rebase: bump the k8s-dependencies group in /api with 1 update
dependabot[bot] Mar 18, 2024
2084251
Merge pull request #275 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 20, 2024
6b3484f
cephfs: add volumegroup service capability
Madhu-1 Feb 5, 2024
f17ea38
cephfs: advertise group snapshot capability
Madhu-1 Feb 5, 2024
68e93a3
journal: fix connection problem with groupjournal
Madhu-1 Mar 19, 2024
445de79
cephfs: add validateCreateVolumeGroupSnapshotRequest
Madhu-1 Feb 5, 2024
ff6eda0
cephfs: initialize VolumeGroupJournal
Madhu-1 Feb 5, 2024
6ec8687
cephfs: register group controller
Madhu-1 Feb 6, 2024
b30da09
build: add ceph_preview to GO_TAGS_LIST
Madhu-1 Mar 1, 2024
ef25a81
cephfs: add locks for volumegroup
Madhu-1 Feb 13, 2024
eff0fe3
cephfs: add error for quiesce operation
Madhu-1 Feb 13, 2024
6a4c45d
cephfs: add helper for quiesce api
Madhu-1 Feb 13, 2024
86bf74b
cephfs: add helper function to getVolumeOptions
Madhu-1 Feb 19, 2024
ffb2b11
cephfs: add helper for group options
Madhu-1 Feb 13, 2024
df770e4
cephfs: implement CreateVolumeGroupSnapshot RPC
Madhu-1 Feb 14, 2024
0f72448
cephfs: implement DeleteVolumeGroupSnapshot RPC
Madhu-1 Feb 14, 2024
728a7f5
util: add UnimplementedGroupControllerServer
Madhu-1 Feb 14, 2024
aa2094b
cephfs: unit test for validateVolumeGroupSnapshotRequest
Madhu-1 Feb 15, 2024
cd18490
rebase: update go-ceph to latest commit
Madhu-1 Mar 19, 2024
47c4816
Merge pull request #276 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 21, 2024
d56c9ab
helm: CSIDriver add labels and seLinuxMount disabling method
Mar 20, 2024
5224d58
cephfs: add support for encryption in ceph-csi-cephfs chart
NymanRobin Mar 18, 2024
28bc4d1
Merge pull request #277 from red-hat-storage/sync_us--devel
openshift-merge-bot[bot] Mar 22, 2024
bc0ba2f
Manual syncing from red-hat-storage/ceph-csi:devel into release-4.16
nixpanic Mar 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ endif
GO_PROJECT=github.com/ceph/ceph-csi

CEPH_VERSION ?= $(shell . $(CURDIR)/build.env ; echo $${CEPH_VERSION})
GO_TAGS_LIST ?= $(CEPH_VERSION)
# TODO: ceph_preview tag required for FSQuiesce API
GO_TAGS_LIST ?= $(CEPH_VERSION) ceph_preview

# go build flags
LDFLAGS ?=
Expand Down Expand Up @@ -166,6 +167,10 @@ cephcsi: check-env
e2e.test: check-env
go test $(GO_TAGS) -mod=vendor -c ./e2e

.PHONY: rbd-group-snapshot
rbd-group-snapshot:
Copy link
Member

Choose a reason for hiding this comment

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

@nixpanic i hope this is not required

Copy link
Member Author

Choose a reason for hiding this comment

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

no, that is part of testing I'm doing. But it seems to be included in the devel branch too?

Copy link
Member

Choose a reason for hiding this comment

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

go build -o _output/rbd-group-snapshot ./tools/rbd-group-snapshot

#
# Update the generated deploy/ files when the template changed. This requires
# running 'go mod vendor' so update the API files under the vendor/ directory.
Expand Down
1 change: 0 additions & 1 deletion OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ aliases:
- nixpanic
- pkalever
- rakshith-r
- riya-singhal31
- yati1998
2 changes: 2 additions & 0 deletions PendingReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@

## Features

- kms: added Azure Key Vault as a supported KMS in [PR](https://github.com/ceph/ceph-csi/pull/4455)

## NOTE
6 changes: 3 additions & 3 deletions actions/retest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ go 1.18

require (
github.com/google/go-github v17.0.0+incompatible
golang.org/x/oauth2 v0.17.0
golang.org/x/oauth2 v0.18.0
)

require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-querystring v1.1.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)
12 changes: 6 additions & 6 deletions actions/retest/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
Expand All @@ -24,5 +24,5 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading