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

Syncing latest changes from upstream devel for ceph-csi #387

Merged
merged 7 commits into from
Sep 26, 2024
Merged

Syncing latest changes from upstream devel for ceph-csi #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1edceeb
doc: reset PendingReleaseNotes.md
Madhu-1 Sep 20, 2024
29aecd3
cephfs: return correct error msg
Sep 23, 2024
dbd8462
cephfs: correct error code for volumegroupsnapshot
yati1998 Sep 24, 2024
40ad416
rebase: bump the github-dependencies group with 2 updates
dependabot[bot] Sep 23, 2024
ecf2503
rebase: bump github/codeql-action from 3.26.7 to 3.26.8
dependabot[bot] Sep 23, 2024
77f8c3f
rebase: bump google.golang.org/grpc from 1.66.2 to 1.67.0
dependabot[bot] Sep 23, 2024
f1379e4
rebase: update kube dep to x.31.1
Madhu-1 Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/snyk-container-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ jobs:
args: --file=Dockerfilei
- name: Upload result to GitHub Code Scanning
# yamllint disable-line rule:line-length
uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
with:
sarif_file: snyk.sarif
10 changes: 1 addition & 9 deletions PendingReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
# v3.12 Pending Release Notes
# v3.13 Pending Release Notes

## Breaking Changes

## Features

- deploy: podSecurityContexts can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4664).
- deploy: podSecurityContexts can be configured for ceph-csi-rbd chart in [PR](https://github.com/ceph/ceph-csi/pull/4668)
- deploy: instanceID can be optionally configured for ceph-csi charts in [PR](https://github.com/ceph/ceph-csi/pull/4666)
- rbd: add support for flattenMode option for replication in [PR](https://github.com/ceph/ceph-csi/pull/4678)
- cephfs: support omap data store in radosnamespace via cli argument in [PR](https://github.com/ceph/ceph-csi/pull/4652)
- deploy: radosNamespaceCephFS can be configured for ceph-csi-cephfs chart in [PR](https://github.com/ceph/ceph-csi/pull/4652)
- build: update ceph release to squid in [PR](https://github.com/ceph/ceph-csi/pull/4735)
- build: CentOS Stream 9 is used as OS in the container-images [PR](https://github.com/ceph/ceph-csi/pull/4735)
- util: a log message "Slow GRPC" is now emitted when
CSI GRPC call outlives its deadline [PR](https://github.com/ceph/ceph-csi/pull/4847)

Expand Down
98 changes: 49 additions & 49 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.5
require (
github.com/IBM/keyprotect-go-client v0.15.1
github.com/aws/aws-sdk-go v1.55.5
github.com/aws/aws-sdk-go-v2/service/sts v1.30.7
github.com/aws/aws-sdk-go-v2/service/sts v1.31.1
github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000
github.com/ceph/go-ceph v0.29.0
github.com/container-storage-interface/spec v1.10.0
Expand All @@ -23,24 +23,24 @@ require (
github.com/onsi/ginkgo/v2 v2.20.2
github.com/onsi/gomega v1.34.2
github.com/pkg/xattr v0.4.10
github.com/prometheus/client_golang v1.20.3
github.com/prometheus/client_golang v1.20.4
github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.27.0
golang.org/x/net v0.29.0
golang.org/x/sys v0.25.0
google.golang.org/grpc v1.66.2
google.golang.org/grpc v1.67.0
google.golang.org/protobuf v1.34.2
//
// when updating k8s.io/kubernetes, make sure to update the replace section too
//
k8s.io/api v0.31.1
k8s.io/apimachinery v0.31.1
k8s.io/client-go v12.0.0+incompatible
k8s.io/cloud-provider v0.31.0
k8s.io/cloud-provider v0.31.1
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.31.0
k8s.io/mount-utils v0.31.0
k8s.io/pod-security-admission v0.31.0
k8s.io/kubernetes v1.31.1
k8s.io/mount-utils v0.31.1
k8s.io/pod-security-admission v0.31.1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.19.0
)
Expand All @@ -60,12 +60,12 @@ require (
github.com/ansel1/merry/v2 v2.0.1 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/aws/aws-sdk-go-v2 v1.30.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect
github.com/aws/smithy-go v1.20.4 // indirect
github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect
github.com/aws/smithy-go v1.21.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
Expand Down Expand Up @@ -158,26 +158,26 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.24.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.31.0 // indirect
k8s.io/apiserver v0.31.0 // indirect
k8s.io/component-base v0.31.0 // indirect
k8s.io/component-helpers v0.31.0 // indirect
k8s.io/controller-manager v0.31.0 // indirect
k8s.io/kms v0.31.0 // indirect
k8s.io/apiextensions-apiserver v0.31.1 // indirect
k8s.io/apiserver v0.31.1 // indirect
k8s.io/component-base v0.31.1 // indirect
k8s.io/component-helpers v0.31.1 // indirect
k8s.io/controller-manager v0.31.1 // indirect
k8s.io/kms v0.31.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/kubelet v0.0.0 // indirect
Expand All @@ -200,36 +200,36 @@ replace (
//
// k8s.io/kubernetes depends on these k8s.io packages, but unversioned
//
k8s.io/api => k8s.io/api v0.31.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0
k8s.io/apimachinery => k8s.io/apimachinery v0.31.0
k8s.io/apiserver => k8s.io/apiserver v0.31.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0
k8s.io/client-go => k8s.io/client-go v0.31.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0
k8s.io/code-generator => k8s.io/code-generator v0.31.0
k8s.io/component-base => k8s.io/component-base v0.31.0
k8s.io/component-helpers => k8s.io/component-helpers v0.31.0
k8s.io/controller-manager => k8s.io/controller-manager v0.31.0
k8s.io/cri-api => k8s.io/cri-api v0.31.0
k8s.io/cri-client => k8s.io/cri-client v0.31.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0
k8s.io/endpointslice => k8s.io/endpointslice v0.31.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0
k8s.io/kubectl => k8s.io/kubectl v0.31.0
k8s.io/kubelet => k8s.io/kubelet v0.31.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0
k8s.io/metrics => k8s.io/metrics v0.31.0
k8s.io/api => k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
k8s.io/apiserver => k8s.io/apiserver v0.31.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1
k8s.io/client-go => k8s.io/client-go v0.31.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.1
k8s.io/code-generator => k8s.io/code-generator v0.31.1
k8s.io/component-base => k8s.io/component-base v0.31.1
k8s.io/component-helpers => k8s.io/component-helpers v0.31.1
k8s.io/controller-manager => k8s.io/controller-manager v0.31.1
k8s.io/cri-api => k8s.io/cri-api v0.31.1
k8s.io/cri-client => k8s.io/cri-client v0.31.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.1
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.1
k8s.io/endpointslice => k8s.io/endpointslice v0.31.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.1
k8s.io/kubectl => k8s.io/kubectl v0.31.1
k8s.io/kubelet => k8s.io/kubelet v0.31.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.1
k8s.io/metrics => k8s.io/metrics v0.31.1

// TODO: replace with latest once https://github.com/ceph/ceph-csi/issues/4633 is fixed
k8s.io/mount-utils => k8s.io/mount-utils v0.29.3
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.1
// layeh.com seems to be misbehaving
layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
)
Expand Down
Loading