From 266e5b3b80a486303cf6bcc48040a4bdc0da8792 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 20:17:55 +0000 Subject: [PATCH 1/5] rebase: bump github.com/onsi/gomega from 1.18.0 to 1.18.1 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.18.0 to 1.18.1. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.18.0...v1.18.1) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/onsi/gomega/CHANGELOG.md | 5 +++++ vendor/github.com/onsi/gomega/gomega_dsl.go | 2 +- vendor/github.com/onsi/gomega/matchers/have_field.go | 7 +++++++ vendor/modules.txt | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index bab176980..67699d499 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 github.com/libopenstorage/secrets v0.0.0-20210908194121-a1d19aa9713a github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.18.0 + github.com/onsi/gomega v1.18.1 github.com/pborman/uuid v1.2.1 github.com/prometheus/client_golang v1.12.1 github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 3951aaa37..34711db81 100644 --- a/go.sum +++ b/go.sum @@ -861,8 +861,8 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.0 h1:ngbYoRctxjl8SiF7XgP0NxBFbfHcg3wfHMMaFHWwMTM= -github.com/onsi/gomega v1.18.0/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= +github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= diff --git a/vendor/github.com/onsi/gomega/CHANGELOG.md b/vendor/github.com/onsi/gomega/CHANGELOG.md index 78ca39a90..e3b437985 100644 --- a/vendor/github.com/onsi/gomega/CHANGELOG.md +++ b/vendor/github.com/onsi/gomega/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.18.1 + +## Fixes +- Add pointer support to HaveField matcher (#495) [79e41a3] + ## 1.18.0 ## Features diff --git a/vendor/github.com/onsi/gomega/gomega_dsl.go b/vendor/github.com/onsi/gomega/gomega_dsl.go index 81181dc94..6936e2411 100644 --- a/vendor/github.com/onsi/gomega/gomega_dsl.go +++ b/vendor/github.com/onsi/gomega/gomega_dsl.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega/types" ) -const GOMEGA_VERSION = "1.18.0" +const GOMEGA_VERSION = "1.18.1" const nilGomegaPanic = `You are trying to make an assertion, but haven't registered Gomega's fail handler. If you're using Ginkgo then you probably forgot to put your assertion in an It(). diff --git a/vendor/github.com/onsi/gomega/matchers/have_field.go b/vendor/github.com/onsi/gomega/matchers/have_field.go index 2f1a91634..e1fe934d5 100644 --- a/vendor/github.com/onsi/gomega/matchers/have_field.go +++ b/vendor/github.com/onsi/gomega/matchers/have_field.go @@ -12,6 +12,13 @@ func extractField(actual interface{}, field string) (interface{}, error) { fields := strings.SplitN(field, ".", 2) actualValue := reflect.ValueOf(actual) + if actualValue.Kind() == reflect.Ptr { + actualValue = actualValue.Elem() + } + if actualValue == (reflect.Value{}) { + return nil, fmt.Errorf("HaveField encountered nil while dereferencing a pointer of type %T.", actual) + } + if actualValue.Kind() != reflect.Struct { return nil, fmt.Errorf("HaveField encountered:\n%s\nWhich is not a struct.", format.Object(actual, 1)) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 2d53c4b36..4fce93e51 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -362,7 +362,7 @@ github.com/onsi/ginkgo/reporters/stenographer github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty github.com/onsi/ginkgo/types -# github.com/onsi/gomega v1.18.0 +# github.com/onsi/gomega v1.18.1 ## explicit; go 1.16 github.com/onsi/gomega github.com/onsi/gomega/format From c0e70ca8cb37724aca6b1d8eddd63a65c2a67d09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 20:12:42 +0000 Subject: [PATCH 2/5] rebase: bump k8s.io/kubernetes from 1.23.2 to 1.23.3 Bumps [k8s.io/kubernetes](https://github.com/kubernetes/kubernetes) from 1.23.2 to 1.23.3. - [Release notes](https://github.com/kubernetes/kubernetes/releases) - [Commits](https://github.com/kubernetes/kubernetes/compare/v1.23.2...v1.23.3) --- updated-dependencies: - dependency-name: k8s.io/kubernetes dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 68 ++++++++-------- go.sum | 79 ++++++++++--------- .../k8s.io/kubernetes/pkg/volume/plugins.go | 2 + vendor/modules.txt | 74 ++++++++--------- 4 files changed, 113 insertions(+), 110 deletions(-) diff --git a/go.mod b/go.mod index 67699d499..22bed3204 100644 --- a/go.mod +++ b/go.mod @@ -26,17 +26,17 @@ require ( golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 google.golang.org/grpc v1.44.0 google.golang.org/protobuf v1.27.1 - k8s.io/api v0.23.2 - k8s.io/apimachinery v0.23.2 + k8s.io/api v0.23.3 + k8s.io/apimachinery v0.23.3 k8s.io/client-go v12.0.0+incompatible - k8s.io/cloud-provider v0.23.2 + k8s.io/cloud-provider v0.23.3 k8s.io/klog/v2 v2.40.1 // // when updating k8s.io/kubernetes, make sure to update the replace section too // - k8s.io/kubernetes v1.23.2 - k8s.io/mount-utils v0.23.2 - k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b + k8s.io/kubernetes v1.23.3 + k8s.io/mount-utils v0.23.3 + k8s.io/utils v0.0.0-20211116205334-6203023598ed sigs.k8s.io/controller-runtime v0.11.0-beta.0.0.20211208212546-f236f0345ad2 ) @@ -139,9 +139,9 @@ require ( gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - k8s.io/apiserver v0.23.2 // indirect - k8s.io/component-base v0.23.2 // indirect - k8s.io/component-helpers v0.23.2 // indirect + k8s.io/apiserver v0.23.3 // indirect + k8s.io/component-base v0.23.3 // indirect + k8s.io/component-helpers v0.23.3 // indirect k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect k8s.io/kubectl v0.0.0 // indirect k8s.io/kubelet v0.0.0 // indirect @@ -160,31 +160,31 @@ replace ( // // k8s.io/kubernetes depends on these k8s.io packages, but unversioned // - k8s.io/api => k8s.io/api v0.23.2 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.2 - k8s.io/apimachinery => k8s.io/apimachinery v0.23.2 - k8s.io/apiserver => k8s.io/apiserver v0.23.2 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.2 - k8s.io/client-go => k8s.io/client-go v0.23.2 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.2 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.2 - k8s.io/code-generator => k8s.io/code-generator v0.23.2 - k8s.io/component-base => k8s.io/component-base v0.23.2 - k8s.io/component-helpers => k8s.io/component-helpers v0.23.2 - k8s.io/controller-manager => k8s.io/controller-manager v0.23.2 - k8s.io/cri-api => k8s.io/cri-api v0.23.2 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.2 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.2 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.2 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.2 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.2 - k8s.io/kubectl => k8s.io/kubectl v0.23.2 - k8s.io/kubelet => k8s.io/kubelet v0.23.2 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.2 - k8s.io/metrics => k8s.io/metrics v0.23.2 - k8s.io/mount-utils => k8s.io/mount-utils v0.23.2 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.2 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.2 + k8s.io/api => k8s.io/api v0.23.3 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.3 + k8s.io/apimachinery => k8s.io/apimachinery v0.23.3 + k8s.io/apiserver => k8s.io/apiserver v0.23.3 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.3 + k8s.io/client-go => k8s.io/client-go v0.23.3 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.3 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.3 + k8s.io/code-generator => k8s.io/code-generator v0.23.3 + k8s.io/component-base => k8s.io/component-base v0.23.3 + k8s.io/component-helpers => k8s.io/component-helpers v0.23.3 + k8s.io/controller-manager => k8s.io/controller-manager v0.23.3 + k8s.io/cri-api => k8s.io/cri-api v0.23.3 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.3 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.3 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.3 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.3 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.3 + k8s.io/kubectl => k8s.io/kubectl v0.23.3 + k8s.io/kubelet => k8s.io/kubelet v0.23.3 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.3 + k8s.io/metrics => k8s.io/metrics v0.23.3 + k8s.io/mount-utils => k8s.io/mount-utils v0.23.3 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.3 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.3 // layeh.com seems to be misbehaving layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917 ) diff --git a/go.sum b/go.sum index 34711db81..faaf870d2 100644 --- a/go.sum +++ b/go.sum @@ -1689,28 +1689,28 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.23.2 h1:62cpzreV3dCuj0hqPi8r4dyWh48ogMcyh+ga9jEGij4= -k8s.io/api v0.23.2/go.mod h1:sYuDb3flCtRPI8ghn6qFrcK5ZBu2mhbElxRE95qpwlI= -k8s.io/apiextensions-apiserver v0.23.2 h1:N6CIVAhmF0ahgFKUMDdV/AUyckhUb4nIyVPohPtdUPk= -k8s.io/apiextensions-apiserver v0.23.2/go.mod h1:9cs7avT6+GfzbB0pambTvH11wcaR85QQg4ovl9s15UU= -k8s.io/apimachinery v0.23.2 h1:dBmjCOeYBdg2ibcQxMuUq+OopZ9fjfLIR5taP/XKeTs= -k8s.io/apimachinery v0.23.2/go.mod h1:zDqeV0AK62LbCI0CI7KbWCAYdLg+E+8UXJ0rIz5gmS8= -k8s.io/apiserver v0.23.2 h1:vGFCojjwSLyunapA7FWuzyekml/s0nAsoh4iBpzWzOs= -k8s.io/apiserver v0.23.2/go.mod h1:Kdt8gafkPev9Gfh+H6lCPbmRu42f7BfhOfHKKa3dtyU= -k8s.io/cli-runtime v0.23.2/go.mod h1:Ag70akCDvwux4HxY+nH2J3UqE2e6iwSSdG1HE6p1VTU= -k8s.io/client-go v0.23.2 h1:BNbOcxa99jxHH8mM1cPKGIrrKRnCSAfAtyonYGsbFtE= -k8s.io/client-go v0.23.2/go.mod h1:k3YbsWg6GWdHF1THHTQP88X9RhB1DWPo3Dq7KfU/D1c= -k8s.io/cloud-provider v0.23.2 h1:bXZWXLjtzz2EMaPWIOwqS18XHYTMZSTDYHR48Ibrxz8= -k8s.io/cloud-provider v0.23.2/go.mod h1:ZJO37TsfHzOz+uQqxnnaR4S94ac9chjar8uHP+kUu2w= -k8s.io/cluster-bootstrap v0.23.2/go.mod h1:KSwHnKiP0O5VSkhXLpdNTiTga9/Yyb2/w7g1V1ZcXUk= -k8s.io/code-generator v0.23.2/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk= -k8s.io/component-base v0.23.2 h1:dAYmUhWIBWO762etTjBEEKtYYHi5CoQInSLtK6LM1Zs= -k8s.io/component-base v0.23.2/go.mod h1:wS9Z03MO3oJ0RU8bB/dbXTiluGju+SC/F5i660gxB8c= -k8s.io/component-helpers v0.23.2 h1:R1PaugmLBCMpc7+srxGL8DsH1NEo/KUSJPY62LVH8CU= -k8s.io/component-helpers v0.23.2/go.mod h1:J6CMwiaf0izLoNwiLl2OymB4+rGTsTpWp6PL/AqOM4U= -k8s.io/controller-manager v0.23.2/go.mod h1:l4+ZujXlzNpY1E9TkwaCB6BncYKyq2jD8OW6m8x35B0= -k8s.io/cri-api v0.23.2/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4= -k8s.io/csi-translation-lib v0.23.2/go.mod h1:n3igp3ZXcg5XLwPjK03QTSWBIoksKo6oTKMdtRbVvx8= +k8s.io/api v0.23.3 h1:KNrME8KHGr12Ozjf8ytOewKzZh6hl/hHUZeHddT3a38= +k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ= +k8s.io/apiextensions-apiserver v0.23.3 h1:JvPJA7hSEAqMRteveq4aj9semilAZYcJv+9HHFWfUdM= +k8s.io/apiextensions-apiserver v0.23.3/go.mod h1:/ZpRXdgKZA6DvIVPEmXDCZJN53YIQEUDF+hrpIQJL38= +k8s.io/apimachinery v0.23.3 h1:7IW6jxNzrXTsP0c8yXz2E5Yx/WTzVPTsHIx/2Vm0cIk= +k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/apiserver v0.23.3 h1:gWY1DmA0AdAGR/H+Q/1FtyGkFq8xqSaZOw7oLopmO8k= +k8s.io/apiserver v0.23.3/go.mod h1:3HhsTmC+Pn+Jctw+Ow0LHA4dQ4oXrQ4XJDzrVDG64T4= +k8s.io/cli-runtime v0.23.3/go.mod h1:yA00O5pDqnjkBh8fkuugBbfIfjB1nOpz+aYLotbnOfc= +k8s.io/client-go v0.23.3 h1:23QYUmCQ/W6hW78xIwm3XqZrrKZM+LWDqW2zfo+szJs= +k8s.io/client-go v0.23.3/go.mod h1:47oMd+YvAOqZM7pcQ6neJtBiFH7alOyfunYN48VsmwE= +k8s.io/cloud-provider v0.23.3 h1:/3hcsBAyG5VpeDAyJQvRqf5US4dHU0Hu57MJiq4zG/w= +k8s.io/cloud-provider v0.23.3/go.mod h1:Ik+pKlpPOp0Zs906xyOpT3g2xB9A8VGNdejMTZS6EeA= +k8s.io/cluster-bootstrap v0.23.3/go.mod h1:NwUIksUHKNOKIHg/AfLH4NxqylbfEVXUh9EX2NxHZII= +k8s.io/code-generator v0.23.3/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk= +k8s.io/component-base v0.23.3 h1:q+epprVdylgecijVGVdf4MbizEL2feW4ssd7cdo6LVY= +k8s.io/component-base v0.23.3/go.mod h1:1Smc4C60rWG7d3HjSYpIwEbySQ3YWg0uzH5a2AtaTLg= +k8s.io/component-helpers v0.23.3 h1:OzuQpfsJsjGvT2nYnp0JsyxpGbnsv0GSvRlIkMKx+I8= +k8s.io/component-helpers v0.23.3/go.mod h1:SH+W/WPTaTenbWyDEeY7iytAQiMh45aqKxkvlqQ57cg= +k8s.io/controller-manager v0.23.3/go.mod h1:E0ss6ogA93sZ+AuibQSa7H4xWIiICTYFjowkjellVeU= +k8s.io/cri-api v0.23.3/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4= +k8s.io/csi-translation-lib v0.23.3/go.mod h1:8J7hpeqMoCJWofd1lCs4vZrEshdbVYrqurFeB6GZ/+E= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -1723,32 +1723,33 @@ k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.40.1 h1:P4RRucWk/lFOlDdkAr3mc7iWFkgKrZY9qZMAgek06S4= k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-aggregator v0.23.2/go.mod h1:hoxP4rZREnjCJmrb0pHFPqm7+pkxoFjh8IpXL7OBWRA= -k8s.io/kube-controller-manager v0.23.2/go.mod h1:vlHhiAlUMI4OMyu/qsmEKb+hklNOjj/ffh5dYufqfHk= +k8s.io/kube-aggregator v0.23.3/go.mod h1:pt5QJ3QaIdhZzNlUvN5wndbM0LNT4BvhszGkzy2QdFo= +k8s.io/kube-controller-manager v0.23.3/go.mod h1:e8m5dhjei67DlLZA/QTvenxiGyonG9UhgHtU1LMslJE= k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/kube-proxy v0.23.2/go.mod h1:doKBcqhM+EgvOo145oP02zP1Hk11jOSKK+FiAS5zdlo= -k8s.io/kube-scheduler v0.23.2/go.mod h1:K70jKh9XukwUJNxXA6k+WJUAW9zZkGR3CGdUApZg0dc= -k8s.io/kubectl v0.23.2 h1:YakGzFN1csIOW/Us5VsLxjcu5Q6Vh5rqcvukcNuBwFk= -k8s.io/kubectl v0.23.2/go.mod h1:zWm5wt8PdRmHiVhE9a7q7XYW4WFX9StkZGnC18+1v3M= -k8s.io/kubelet v0.23.2 h1:hrixnMsh1yv7P/UZ/2QCBp7x6G4y3Fr5FiavF3a0MIw= -k8s.io/kubelet v0.23.2/go.mod h1:/Huumr8/3hz46AuMI64UBwns2t/dcogiR5XWF6yrHo0= -k8s.io/kubernetes v1.23.2 h1:Kp3cpKrv6VRQbaZoD6tVDjpKPIfNb5P34DLv7qQzf7U= -k8s.io/kubernetes v1.23.2/go.mod h1:UNnyc4mwldo0ipufrTkGbL06VQRtN9w9mLLTZLh56+w= -k8s.io/legacy-cloud-providers v0.23.2/go.mod h1:b4r2DrP+PT0D4kxenynayJ7kJQLwzoVHh1Lqw3cozwE= -k8s.io/metrics v0.23.2/go.mod h1:idJHc+lLK5teHUC6Z2+d6qTKA12d5FLDxmC/DHiUYKc= -k8s.io/mount-utils v0.23.2 h1:f6jSJ8Z/tKTLOEzBzpxd+QKP6swdH9/Z0DTfMxlKnR0= -k8s.io/mount-utils v0.23.2/go.mod h1:9pFhzVjxle1osJUo++9MFDat9HPkQUOoHCn+eExZ3Ew= -k8s.io/pod-security-admission v0.23.2/go.mod h1:qbwG5XF7vHgTTk8XemjkR1GXAmyNHQQAo5bHWAJSskE= -k8s.io/sample-apiserver v0.23.2/go.mod h1:E6yG+7Y6Y9ElyFOXUQb3CyO63FW20U0ut5fR4I8c70Y= +k8s.io/kube-proxy v0.23.3/go.mod h1:XdvwqJkR9r0ddUAX4ruA4V22Kws3qzKvgL3rIq584Ko= +k8s.io/kube-scheduler v0.23.3/go.mod h1:/thFQoAMv9/olDOEYVSQbUohmkJJyIPUmpVu0UealSM= +k8s.io/kubectl v0.23.3 h1:gJsF7cahkWDPYlNvYKK+OrBZLAJUBzCym+Zsi+dfi1E= +k8s.io/kubectl v0.23.3/go.mod h1:VBeeXNgLhSabu4/k0O7Q0YujgnA3+CLTUE0RcmF73yY= +k8s.io/kubelet v0.23.3 h1:jYed8HoT0H2zXzf5Av+Ml8z5erN39uJfKh/yplYMgkg= +k8s.io/kubelet v0.23.3/go.mod h1:RZxGSCsiwoWJ9z6mVla+jhiLfCFIKC16yAS38D7GQSE= +k8s.io/kubernetes v1.23.3 h1:weuFJOkRP7+057uvhNUYbVTVCog/klquhbtKRD+UHUo= +k8s.io/kubernetes v1.23.3/go.mod h1:C0AB/I7M4Nu6d1ELyGdC8qrrHEc6J5l8CHUashza1Io= +k8s.io/legacy-cloud-providers v0.23.3/go.mod h1:s9vv59dUv4SU+HAm9C/YDdyw2OY9qmFYmcGEwr/ecDc= +k8s.io/metrics v0.23.3/go.mod h1:Ut8TvkbsO4oMVeUzaTArvPrcw9QRFLs2XNzUlORjdYE= +k8s.io/mount-utils v0.23.3 h1:zPRPjS5rCOeEo4M6H5ysnwddVuYwEgJsiMgo2fgbPH0= +k8s.io/mount-utils v0.23.3/go.mod h1:OTN3LQPiOGMfx/SmVlsnySwsAmh4gYrDYLchlMHtf98= +k8s.io/pod-security-admission v0.23.3/go.mod h1:vULEGUgsujyrKBz3RRRZnvrJJt115gu0GICArDmgzqo= +k8s.io/sample-apiserver v0.23.3/go.mod h1:5yDZRMfFvp7/2BOXBwk0AFNsD00iyuXeEsWZSoLFeGw= k8s.io/system-validators v1.6.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs= k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE= +k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go b/vendor/k8s.io/kubernetes/pkg/volume/plugins.go index 58ef46940..70da69e40 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/plugins.go @@ -449,6 +449,8 @@ type VolumeHost interface { // Returns the name of the node GetNodeName() types.NodeName + GetAttachedVolumesFromNodeStatus() (map[v1.UniqueVolumeName]string, error) + // Returns the event recorder of kubelet. GetEventRecorder() record.EventRecorder diff --git a/vendor/modules.txt b/vendor/modules.txt index 4fce93e51..f4b9e9db1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -696,7 +696,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.23.2 => k8s.io/api v0.23.2 +# k8s.io/api v0.23.3 => k8s.io/api v0.23.3 ## explicit; go 1.16 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -745,7 +745,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.23.2 => k8s.io/apimachinery v0.23.2 +# k8s.io/apimachinery v0.23.3 => k8s.io/apimachinery v0.23.3 ## explicit; go 1.16 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -801,7 +801,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.23.2 => k8s.io/apiserver v0.23.2 +# k8s.io/apiserver v0.23.3 => k8s.io/apiserver v0.23.3 ## explicit; go 1.16 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -842,7 +842,7 @@ k8s.io/apiserver/pkg/util/feature k8s.io/apiserver/pkg/util/webhook k8s.io/apiserver/pkg/util/x509metrics k8s.io/apiserver/pkg/warning -# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.23.2 +# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.23.3 ## explicit; go 1.16 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -1085,12 +1085,12 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.23.2 => k8s.io/cloud-provider v0.23.2 +# k8s.io/cloud-provider v0.23.3 => k8s.io/cloud-provider v0.23.3 ## explicit; go 1.16 k8s.io/cloud-provider k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/helpers -# k8s.io/component-base v0.23.2 => k8s.io/component-base v0.23.2 +# k8s.io/component-base v0.23.3 => k8s.io/component-base v0.23.3 ## explicit; go 1.16 k8s.io/component-base/cli/flag k8s.io/component-base/config @@ -1101,7 +1101,7 @@ k8s.io/component-base/metrics/legacyregistry k8s.io/component-base/metrics/testutil k8s.io/component-base/traces k8s.io/component-base/version -# k8s.io/component-helpers v0.23.2 => k8s.io/component-helpers v0.23.2 +# k8s.io/component-helpers v0.23.3 => k8s.io/component-helpers v0.23.3 ## explicit; go 1.16 k8s.io/component-helpers/node/util/sysctl k8s.io/component-helpers/scheduling/corev1 @@ -1113,14 +1113,14 @@ k8s.io/klog/v2 ## explicit; go 1.16 k8s.io/kube-openapi/pkg/schemaconv k8s.io/kube-openapi/pkg/util/proto -# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.23.2 +# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.23.3 ## explicit; go 1.16 k8s.io/kubectl/pkg/scale k8s.io/kubectl/pkg/util/podutils -# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.23.2 +# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.23.3 ## explicit; go 1.16 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.23.2 +# k8s.io/kubernetes v1.23.3 ## explicit; go 1.16 k8s.io/kubernetes/pkg/api/legacyscheme k8s.io/kubernetes/pkg/api/service @@ -1183,10 +1183,10 @@ k8s.io/kubernetes/test/e2e/storage/podlogs k8s.io/kubernetes/test/e2e/storage/utils k8s.io/kubernetes/test/utils k8s.io/kubernetes/test/utils/image -# k8s.io/mount-utils v0.23.2 => k8s.io/mount-utils v0.23.2 +# k8s.io/mount-utils v0.23.3 => k8s.io/mount-utils v0.23.3 ## explicit; go 1.16 k8s.io/mount-utils -# k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b +# k8s.io/utils v0.0.0-20211116205334-6203023598ed ## explicit; go 1.12 k8s.io/utils/buffer k8s.io/utils/clock @@ -1262,29 +1262,29 @@ sigs.k8s.io/yaml # github.com/golang/protobuf => github.com/golang/protobuf v1.4.3 # github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 # gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0 -# k8s.io/api => k8s.io/api v0.23.2 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.2 -# k8s.io/apimachinery => k8s.io/apimachinery v0.23.2 -# k8s.io/apiserver => k8s.io/apiserver v0.23.2 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.2 -# k8s.io/client-go => k8s.io/client-go v0.23.2 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.2 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.2 -# k8s.io/code-generator => k8s.io/code-generator v0.23.2 -# k8s.io/component-base => k8s.io/component-base v0.23.2 -# k8s.io/component-helpers => k8s.io/component-helpers v0.23.2 -# k8s.io/controller-manager => k8s.io/controller-manager v0.23.2 -# k8s.io/cri-api => k8s.io/cri-api v0.23.2 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.2 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.2 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.2 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.2 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.2 -# k8s.io/kubectl => k8s.io/kubectl v0.23.2 -# k8s.io/kubelet => k8s.io/kubelet v0.23.2 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.2 -# k8s.io/metrics => k8s.io/metrics v0.23.2 -# k8s.io/mount-utils => k8s.io/mount-utils v0.23.2 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.2 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.2 +# k8s.io/api => k8s.io/api v0.23.3 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.3 +# k8s.io/apimachinery => k8s.io/apimachinery v0.23.3 +# k8s.io/apiserver => k8s.io/apiserver v0.23.3 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.3 +# k8s.io/client-go => k8s.io/client-go v0.23.3 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.3 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.3 +# k8s.io/code-generator => k8s.io/code-generator v0.23.3 +# k8s.io/component-base => k8s.io/component-base v0.23.3 +# k8s.io/component-helpers => k8s.io/component-helpers v0.23.3 +# k8s.io/controller-manager => k8s.io/controller-manager v0.23.3 +# k8s.io/cri-api => k8s.io/cri-api v0.23.3 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.3 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.3 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.3 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.3 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.3 +# k8s.io/kubectl => k8s.io/kubectl v0.23.3 +# k8s.io/kubelet => k8s.io/kubelet v0.23.3 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.3 +# k8s.io/metrics => k8s.io/metrics v0.23.3 +# k8s.io/mount-utils => k8s.io/mount-utils v0.23.3 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.3 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.3 # layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917 From 8f6a7da538f6c2b3a2d23fb7cf4ce13a5b450134 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 8 Feb 2022 09:36:24 +0530 Subject: [PATCH 3/5] cephfs: dont set explicit permissions on the volume At present we are node staging with worldwide permissions which is not correct. We should allow the CO to take care of it and make the decision. This commit also remove `fuseMountOptions` and `KernelMountOptions` as they are no longer needed Signed-off-by: Humble Chirammal --- internal/cephfs/nodeserver.go | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/internal/cephfs/nodeserver.go b/internal/cephfs/nodeserver.go index 8b7c55476..9c2bc145a 100644 --- a/internal/cephfs/nodeserver.go +++ b/internal/cephfs/nodeserver.go @@ -164,8 +164,6 @@ func (*NodeServer) mount(ctx context.Context, volOptions *core.VolumeOptions, re log.DebugLog(ctx, "cephfs: mounting volume %s with %s", volID, m.Name()) readOnly := "ro" - fuseMountOptions := strings.Split(volOptions.FuseMountOptions, ",") - kernelMountOptions := strings.Split(volOptions.KernelMountOptions, ",") if req.VolumeCapability.AccessMode.Mode == csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY || req.VolumeCapability.AccessMode.Mode == csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY { @@ -173,12 +171,10 @@ func (*NodeServer) mount(ctx context.Context, volOptions *core.VolumeOptions, re case *mounter.FuseMounter: if !csicommon.MountOptionContains(strings.Split(volOptions.FuseMountOptions, ","), readOnly) { volOptions.FuseMountOptions = util.MountOptionsAdd(volOptions.FuseMountOptions, readOnly) - fuseMountOptions = append(fuseMountOptions, readOnly) } case *mounter.KernelMounter: if !csicommon.MountOptionContains(strings.Split(volOptions.KernelMountOptions, ","), readOnly) { volOptions.KernelMountOptions = util.MountOptionsAdd(volOptions.KernelMountOptions, readOnly) - kernelMountOptions = append(kernelMountOptions, readOnly) } } } @@ -191,30 +187,6 @@ func (*NodeServer) mount(ctx context.Context, volOptions *core.VolumeOptions, re return status.Error(codes.Internal, err.Error()) } - if !csicommon.MountOptionContains(kernelMountOptions, readOnly) && - !csicommon.MountOptionContains(fuseMountOptions, readOnly) { - // #nosec - allow anyone to write inside the stagingtarget path - err = os.Chmod(stagingTargetPath, 0o777) - if err != nil { - log.ErrorLog( - ctx, - "failed to change stagingtarget path %s permission for volume %s: %v", - stagingTargetPath, - volID, - err) - uErr := mounter.UnmountVolume(ctx, stagingTargetPath) - if uErr != nil { - log.ErrorLog( - ctx, - "failed to umount stagingtarget path %s for volume %s: %v", - stagingTargetPath, - volID, - uErr) - } - - return status.Error(codes.Internal, err.Error()) - } - } return nil } From ee8fb3f05f98df706cb030c19f9674d9d6361a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20BERNARD?= Date: Fri, 28 Jan 2022 12:08:09 +0100 Subject: [PATCH 4/5] rbd: Fix dataPool in createVolumeResponse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return the dataPool used to create the image instead of the default one provided by the createVolumeRequest. In case of topologyConstrainedDataPools, they may differ. Don't add datapool if it's not present Signed-off-by: Sébastien Bernard --- internal/rbd/controllerserver.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go index b46780ee9..f1b6d1c57 100644 --- a/internal/rbd/controllerserver.go +++ b/internal/rbd/controllerserver.go @@ -166,6 +166,11 @@ func buildCreateVolumeResponse(req *csi.CreateVolumeRequest, rbdVol *rbdVolume) if rbdVol.RadosNamespace != "" { volumeContext["radosNamespace"] = rbdVol.RadosNamespace } + + if rbdVol.DataPool != "" { + volumeContext["dataPool"] = rbdVol.DataPool + } + volume := &csi.Volume{ VolumeId: rbdVol.VolID, CapacityBytes: rbdVol.VolSize, From 0311eb5f447762a581194d649ea4d703da104fb8 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 10 Feb 2022 10:51:13 +0530 Subject: [PATCH 5/5] helm: remove namespace from storageclass yaml removes namespace from non-namespaced storageclass object. fixes: #2714 Replacement for #2715 as we didnt receive any update and PR is already closed. Co-authored-by: jhrcz-ls Signed-off-by: Madhu Rajanna --- charts/ceph-csi-cephfs/templates/storageclass.yaml | 1 - charts/ceph-csi-rbd/templates/storageclass.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/storageclass.yaml b/charts/ceph-csi-cephfs/templates/storageclass.yaml index 62709adc2..4041dec6b 100644 --- a/charts/ceph-csi-cephfs/templates/storageclass.yaml +++ b/charts/ceph-csi-cephfs/templates/storageclass.yaml @@ -3,7 +3,6 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: {{ .Values.storageClass.name }} - namespace: {{ .Release.Namespace }} {{- if .Values.storageClass.annotations }} annotations: {{ toYaml .Values.storageClass.annotations | indent 4 }} diff --git a/charts/ceph-csi-rbd/templates/storageclass.yaml b/charts/ceph-csi-rbd/templates/storageclass.yaml index f381ab3f0..fda713ab3 100644 --- a/charts/ceph-csi-rbd/templates/storageclass.yaml +++ b/charts/ceph-csi-rbd/templates/storageclass.yaml @@ -3,7 +3,6 @@ apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: name: {{ .Values.storageClass.name }} - namespace: {{ .Release.Namespace }} {{- if .Values.storageClass.annotations }} annotations: {{ toYaml .Values.storageClass.annotations | indent 4 }}