diff --git a/go.mod b/go.mod index c51115454e6..c4d02b8a3c4 100644 --- a/go.mod +++ b/go.mod @@ -35,14 +35,14 @@ require ( // // when updating k8s.io/kubernetes, make sure to update the replace section too // - k8s.io/api v0.32.1 - k8s.io/apimachinery v0.32.1 + k8s.io/api v0.32.2 + k8s.io/apimachinery v0.32.2 k8s.io/client-go v12.0.0+incompatible - k8s.io/cloud-provider v0.32.1 + k8s.io/cloud-provider v0.32.2 k8s.io/klog/v2 v2.130.1 k8s.io/kubernetes v1.32.2 - k8s.io/mount-utils v0.32.1 - k8s.io/pod-security-admission v0.32.1 + k8s.io/mount-utils v0.32.2 + k8s.io/pod-security-admission v0.32.2 k8s.io/utils v0.0.0-20241210054802-24370beab758 sigs.k8s.io/controller-runtime v0.20.1 ) @@ -193,19 +193,19 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.32.0 // indirect - k8s.io/apiserver v0.32.1 // indirect - k8s.io/component-base v0.32.1 // indirect - k8s.io/component-helpers v0.32.1 // indirect - k8s.io/controller-manager v0.32.1 // indirect - k8s.io/cri-api v0.32.1 // indirect + k8s.io/apiserver v0.32.2 // indirect + k8s.io/component-base v0.32.2 // indirect + k8s.io/component-helpers v0.32.2 // indirect + k8s.io/controller-manager v0.32.2 // indirect + k8s.io/cri-api v0.32.2 // indirect k8s.io/cri-client v0.0.0 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect - k8s.io/kms v0.32.1 // indirect + k8s.io/kms v0.32.2 // indirect k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect k8s.io/kube-scheduler v0.0.0 // indirect k8s.io/kubectl v0.0.0 // indirect - k8s.io/kubelet v0.32.1 // indirect + k8s.io/kubelet v0.32.2 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect @@ -225,37 +225,37 @@ replace ( // // k8s.io/kubernetes depends on these k8s.io packages, but unversioned // - k8s.io/api => k8s.io/api v0.32.1 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1 - k8s.io/apimachinery => k8s.io/apimachinery v0.32.1 - k8s.io/apiserver => k8s.io/apiserver v0.32.1 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.1 - k8s.io/client-go => k8s.io/client-go v0.32.1 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.1 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.1 - k8s.io/code-generator => k8s.io/code-generator v0.32.1 - k8s.io/component-base => k8s.io/component-base v0.32.1 - k8s.io/component-helpers => k8s.io/component-helpers v0.32.1 - k8s.io/controller-manager => k8s.io/controller-manager v0.32.1 - k8s.io/cri-api => k8s.io/cri-api v0.32.1 - k8s.io/cri-client => k8s.io/cri-client v0.32.1 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.1 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.1 - k8s.io/endpointslice => k8s.io/endpointslice v0.32.1 - k8s.io/externaljwt => k8s.io/externaljwt v0.32.1 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.1 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.1 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.1 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.1 - k8s.io/kubectl => k8s.io/kubectl v0.32.1 - k8s.io/kubelet => k8s.io/kubelet v0.32.1 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.1 - k8s.io/metrics => k8s.io/metrics v0.32.1 + k8s.io/api => k8s.io/api v0.32.2 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2 + k8s.io/apimachinery => k8s.io/apimachinery v0.32.2 + k8s.io/apiserver => k8s.io/apiserver v0.32.2 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2 + k8s.io/client-go => k8s.io/client-go v0.32.2 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.2 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.2 + k8s.io/code-generator => k8s.io/code-generator v0.32.2 + k8s.io/component-base => k8s.io/component-base v0.32.2 + k8s.io/component-helpers => k8s.io/component-helpers v0.32.2 + k8s.io/controller-manager => k8s.io/controller-manager v0.32.2 + k8s.io/cri-api => k8s.io/cri-api v0.32.2 + k8s.io/cri-client => k8s.io/cri-client v0.32.2 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.2 + k8s.io/endpointslice => k8s.io/endpointslice v0.32.2 + k8s.io/externaljwt => k8s.io/externaljwt v0.32.2 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.2 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.2 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.2 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2 + k8s.io/kubectl => k8s.io/kubectl v0.32.2 + k8s.io/kubelet => k8s.io/kubelet v0.32.2 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.2 + k8s.io/metrics => k8s.io/metrics v0.32.2 // 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.32.1 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.1 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.2 // 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 bfb639e24b4..3f6bf0f2083 100644 --- a/go.sum +++ b/go.sum @@ -3546,33 +3546,33 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt 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= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc= -k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k= -k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw= -k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto= -k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs= -k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/apiserver v0.32.1 h1:oo0OozRos66WFq87Zc5tclUX2r0mymoVHRq8JmR7Aak= -k8s.io/apiserver v0.32.1/go.mod h1:UcB9tWjBY7aryeI5zAgzVJB/6k7E97bkr1RgqDz0jPw= -k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU= -k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg= -k8s.io/cloud-provider v0.32.1 h1:74rRhnfca3o4CsjjnIp/C3ARVuSmyNsxgWPtH0yc9Z0= -k8s.io/cloud-provider v0.32.1/go.mod h1:GECSanFT+EeZ/ToX3xlasjETzMUI+VFu92zHUDUsGHw= -k8s.io/code-generator v0.32.1/go.mod h1:zaILfm00CVyP/6/pJMJ3zxRepXkxyDfUV5SNG4CjZI4= -k8s.io/component-base v0.32.1 h1:/5IfJ0dHIKBWysGV0yKTFfacZ5yNV1sulPh3ilJjRZk= -k8s.io/component-base v0.32.1/go.mod h1:j1iMMHi/sqAHeG5z+O9BFNCF698a1u0186zkjMZQ28w= -k8s.io/component-helpers v0.32.1 h1:TwdsSM1vW9GjnfX18lkrZbwE5G9psCIS2/rhenTDXd8= -k8s.io/component-helpers v0.32.1/go.mod h1:1JT1Ei3FD29yFQ18F3laj1WyvxYdHIhyxx6adKMFQXI= -k8s.io/controller-manager v0.32.1 h1:z3oQp1O5l0cSzM/MKf8V4olhJ9TmnELoJRPcV/v1s+Y= -k8s.io/controller-manager v0.32.1/go.mod h1:dVA1UZPbqHH4hEhrrnLvQ4d5qVQCklNB8GEzYV59v/4= -k8s.io/cri-api v0.32.1 h1:XWDw70IJV0GmExhQBYz7H+6iFEaKXcUOpnj5MHQ/JXY= -k8s.io/cri-api v0.32.1/go.mod h1:DCzMuTh2padoinefWME0G678Mc3QFbLMF2vEweGzBAI= -k8s.io/cri-client v0.32.1 h1:3JBsPoGWa+CE0PZNXJRYkh+WCIVoW01k1pIDjgHeVfk= -k8s.io/cri-client v0.32.1/go.mod h1:DRx4uu8kF/1pEoUfAAeVt1l487C4U73FuL7vvhVvKOM= -k8s.io/csi-translation-lib v0.32.1 h1:qqlB+eKiIdUM+GGZfJN/4FMNeuIPIELLxfWfv/LWUYk= -k8s.io/csi-translation-lib v0.32.1/go.mod h1:dc7zXqpUW4FykfAe6TqU32tYewsGhrjI63ZwJWQng3k= -k8s.io/dynamic-resource-allocation v0.32.1 h1:67evLKcvGeD1ScuMR9wkKb0sRaPmQLOAD9K8vgL96FA= -k8s.io/dynamic-resource-allocation v0.32.1/go.mod h1:/W/PeaKUoPcH+4mujtVNB9Ll7z6f8Es3dNVd4x5jN4M= +k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= +k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= +k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4= +k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA= +k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw= +k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= +k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= +k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= +k8s.io/cloud-provider v0.32.2 h1:8EC+fCYo0r0REczSjOZcVuQPCMxXxCKlgxDbYMrzC30= +k8s.io/cloud-provider v0.32.2/go.mod h1:2s8TeAXhVezp5VISaTxM6vW3yDonOZXoN4Aryz1p1PQ= +k8s.io/code-generator v0.32.2/go.mod h1:plh7bWk7JztAUkHM4zpbdy0KOMdrhsePcZL2HLWFH7Y= +k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU= +k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= +k8s.io/component-helpers v0.32.2 h1:2usSAm3zNE5yu5DdAdrKBWLfSYNpU4OPjZywJY5ovP8= +k8s.io/component-helpers v0.32.2/go.mod h1:fvQAoiiOP7jUEUBc9qR0PXiBPuB0I56WTxTkkpcI8g8= +k8s.io/controller-manager v0.32.2 h1:/9XuHWEqofO2Aqa4l7KJGckJUcLVRWfx+qnVkdXoStI= +k8s.io/controller-manager v0.32.2/go.mod h1:o5uo2tLCQhuoMt0RfKcQd0eqaNmSKOKiT+0YELCqXOk= +k8s.io/cri-api v0.32.2 h1:7DuaOHpOcXweZeBUbRdK0iCroxctGp73VwgrA0u7kho= +k8s.io/cri-api v0.32.2/go.mod h1:DCzMuTh2padoinefWME0G678Mc3QFbLMF2vEweGzBAI= +k8s.io/cri-client v0.32.2 h1:vjowJUyu14IbmifqCKJHE9rK/BPSfkXvltqN42W1Zuo= +k8s.io/cri-client v0.32.2/go.mod h1:fRZhmmZW16Qviln8hfy+e8dd2wP/n9B6TiGxLE3zBe0= +k8s.io/csi-translation-lib v0.32.2 h1:aLzAyaoJUc5rgtLi8Xd4No1tet6UpvUsGIgRoGnPSSE= +k8s.io/csi-translation-lib v0.32.2/go.mod h1:PlOKan6Vc0G6a+giQbm36plJ+E1LH+GPRLAVMQMSMcY= +k8s.io/dynamic-resource-allocation v0.32.2 h1:6wP8/GGvhhvTJLrzwPSoMJDnspmosFj1CKmfrAH6m5U= +k8s.io/dynamic-resource-allocation v0.32.2/go.mod h1:+3qnQfvikLHVZrdZ0/gYkRiV96weUR9j7+Ph3Ui/hYU= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= @@ -3583,25 +3583,25 @@ k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.32.1 h1:TW6cswRI/fawoQRFGWLmEceO37rZXupdoRdmO019jCc= -k8s.io/kms v0.32.1/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= +k8s.io/kms v0.32.2 h1:7Ff23ht7W40gTcDwUC8G5WjX5W/nxD8WxbNhIYYNZCI= +k8s.io/kms v0.32.2/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg= k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas= -k8s.io/kube-scheduler v0.32.1 h1:RT484opqmampkWS0XjC7ZnqjpQrJ/rmOBJVPIw4x7WM= -k8s.io/kube-scheduler v0.32.1/go.mod h1:dAZqpc2oeqqwXS3ovQjAod6B+y1IYt1nVfMC+MFTgH0= -k8s.io/kubectl v0.32.1 h1:/btLtXLQUU1rWx8AEvX9jrb9LaI6yeezt3sFALhB8M8= -k8s.io/kubectl v0.32.1/go.mod h1:sezNuyWi1STk4ZNPVRIFfgjqMI6XMf+oCVLjZen/pFQ= -k8s.io/kubelet v0.32.1 h1:bB91GvMsZb+LfzBxnjPEr1Fal/sdxZtYphlfwAaRJGw= -k8s.io/kubelet v0.32.1/go.mod h1:4sAEZ6PlewD0GroV3zscY7llym6kmNNTVmUI/Qshm6w= +k8s.io/kube-scheduler v0.32.2 h1:vBm6iIjWaD10OPmtkt/503LTKvrN8dWVceeBcpKj/ns= +k8s.io/kube-scheduler v0.32.2/go.mod h1:dD5yuYpnsCfgZmzvncUNPdvXGJXA1hw3gXq7DH3+aCQ= +k8s.io/kubectl v0.32.2 h1:TAkag6+XfSBgkqK9I7ZvwtF0WVtUAvK8ZqTt+5zi1Us= +k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8= +k8s.io/kubelet v0.32.2 h1:WFTSYdt3BB1aTApDuKNI16x/4MYqqX8WBBBBh3KupDg= +k8s.io/kubelet v0.32.2/go.mod h1:cC1ms5RS+lu0ckVr6AviCQXHLSPKEBC3D5oaCBdTGkI= k8s.io/kubernetes v1.32.2 h1:mShetlA102UpjRVSGzB+5vjJwy8oPy8FMWrkTH5f37o= k8s.io/kubernetes v1.32.2/go.mod h1:tiIKO63GcdPRBHW2WiUFm3C0eoLczl3f7qi56Dm1W8I= k8s.io/mount-utils v0.29.3 h1:iEcqPP7Vv8UClH8nnMfovtmy/04fIloRW9JuSXykoZ0= k8s.io/mount-utils v0.29.3/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y= -k8s.io/pod-security-admission v0.32.1 h1:jcQjcxSwMsqcnr8ADiYe3Yhts0zEvY8BPEIFY6ducxU= -k8s.io/pod-security-admission v0.32.1/go.mod h1:psSkvN+noAracLrouPjVDID/7TiMWoHQLNoBTVCY/nw= +k8s.io/pod-security-admission v0.32.2 h1:zDfAb/t0LbNU3z0ZMHtCb1zp8x05gWCGhmBYpUptm9A= +k8s.io/pod-security-admission v0.32.2/go.mod h1:yxMPB3i1pGMLfxbe4BiWMuowMD7cdHR32y4nCj4wH+s= k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/vendor/k8s.io/csi-translation-lib/plugins/portworx.go b/vendor/k8s.io/csi-translation-lib/plugins/portworx.go index 474384cfb78..918002c7bc5 100644 --- a/vendor/k8s.io/csi-translation-lib/plugins/portworx.go +++ b/vendor/k8s.io/csi-translation-lib/plugins/portworx.go @@ -18,6 +18,7 @@ package plugins import ( "fmt" + "strings" v1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" @@ -28,6 +29,29 @@ import ( const ( PortworxVolumePluginName = "kubernetes.io/portworx-volume" PortworxDriverName = "pxd.portworx.com" + + OpenStorageAuthSecretNameKey = "openstorage.io/auth-secret-name" + OpenStorageAuthSecretNamespaceKey = "openstorage.io/auth-secret-namespace" + + csiParameterPrefix = "csi.storage.k8s.io/" + + prefixedProvisionerSecretNameKey = csiParameterPrefix + "provisioner-secret-name" + prefixedProvisionerSecretNamespaceKey = csiParameterPrefix + "provisioner-secret-namespace" + + prefixedControllerPublishSecretNameKey = csiParameterPrefix + "controller-publish-secret-name" + prefixedControllerPublishSecretNamespaceKey = csiParameterPrefix + "controller-publish-secret-namespace" + + prefixedNodeStageSecretNameKey = csiParameterPrefix + "node-stage-secret-name" + prefixedNodeStageSecretNamespaceKey = csiParameterPrefix + "node-stage-secret-namespace" + + prefixedNodePublishSecretNameKey = csiParameterPrefix + "node-publish-secret-name" + prefixedNodePublishSecretNamespaceKey = csiParameterPrefix + "node-publish-secret-namespace" + + prefixedControllerExpandSecretNameKey = csiParameterPrefix + "controller-expand-secret-name" + prefixedControllerExpandSecretNamespaceKey = csiParameterPrefix + "controller-expand-secret-namespace" + + prefixedNodeExpandSecretNameKey = csiParameterPrefix + "node-expand-secret-name" + prefixedNodeExpandSecretNamespaceKey = csiParameterPrefix + "node-expand-secret-namespace" ) var _ InTreePlugin = &portworxCSITranslator{} @@ -44,7 +68,34 @@ func (p portworxCSITranslator) TranslateInTreeStorageClassToCSI(logger klog.Logg if sc == nil { return nil, fmt.Errorf("sc is nil") } + + var params = map[string]string{} + for k, v := range sc.Parameters { + switch strings.ToLower(k) { + case OpenStorageAuthSecretNameKey: + params[prefixedProvisionerSecretNameKey] = v + params[prefixedControllerPublishSecretNameKey] = v + params[prefixedNodePublishSecretNameKey] = v + params[prefixedNodeStageSecretNameKey] = v + params[prefixedControllerExpandSecretNameKey] = v + params[prefixedNodeExpandSecretNameKey] = v + case OpenStorageAuthSecretNamespaceKey: + params[prefixedProvisionerSecretNamespaceKey] = v + params[prefixedControllerPublishSecretNamespaceKey] = v + params[prefixedNodePublishSecretNamespaceKey] = v + params[prefixedNodeStageSecretNamespaceKey] = v + params[prefixedControllerExpandSecretNamespaceKey] = v + params[prefixedNodeExpandSecretNamespaceKey] = v + default: + // All other parameters can be copied as is + params[k] = v + } + } + if len(params) > 0 { + sc.Parameters = params + } sc.Provisioner = PortworxDriverName + return sc, nil } @@ -87,11 +138,26 @@ func (p portworxCSITranslator) TranslateInTreePVToCSI(logger klog.Logger, pv *v1 if pv == nil || pv.Spec.PortworxVolume == nil { return nil, fmt.Errorf("pv is nil or PortworxVolume not defined on pv") } + var secretRef *v1.SecretReference + + if metav1.HasAnnotation(pv.ObjectMeta, OpenStorageAuthSecretNameKey) && + metav1.HasAnnotation(pv.ObjectMeta, OpenStorageAuthSecretNamespaceKey) { + secretRef = &v1.SecretReference{ + Name: pv.Annotations[OpenStorageAuthSecretNameKey], + Namespace: pv.Annotations[OpenStorageAuthSecretNamespaceKey], + } + } + csiSource := &v1.CSIPersistentVolumeSource{ - Driver: PortworxDriverName, - VolumeHandle: pv.Spec.PortworxVolume.VolumeID, - FSType: pv.Spec.PortworxVolume.FSType, - VolumeAttributes: make(map[string]string), // copy access mode + Driver: PortworxDriverName, + VolumeHandle: pv.Spec.PortworxVolume.VolumeID, + FSType: pv.Spec.PortworxVolume.FSType, + VolumeAttributes: make(map[string]string), // copy access mode + ControllerPublishSecretRef: secretRef, + NodeStageSecretRef: secretRef, + NodePublishSecretRef: secretRef, + ControllerExpandSecretRef: secretRef, + NodeExpandSecretRef: secretRef, } pv.Spec.PortworxVolume = nil pv.Spec.CSI = csiSource diff --git a/vendor/modules.txt b/vendor/modules.txt index a91bd80a1bb..bdedfd62e81 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1066,7 +1066,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.1 => k8s.io/api v0.32.1 +# k8s.io/api v0.32.2 => k8s.io/api v0.32.2 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1127,12 +1127,12 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.32.0 => k8s.io/apiextensions-apiserver v0.32.1 +# k8s.io/apiextensions-apiserver v0.32.0 => k8s.io/apiextensions-apiserver v0.32.2 ## explicit; go 1.23.0 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/features -# k8s.io/apimachinery v0.32.1 => k8s.io/apimachinery v0.32.1 +# k8s.io/apimachinery v0.32.2 => k8s.io/apimachinery v0.32.2 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1200,7 +1200,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.32.1 => k8s.io/apiserver v0.32.1 +# k8s.io/apiserver v0.32.2 => k8s.io/apiserver v0.32.2 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1355,7 +1355,7 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.32.1 +# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.32.2 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1706,7 +1706,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.32.1 => k8s.io/cloud-provider v0.32.1 +# k8s.io/cloud-provider v0.32.2 => k8s.io/cloud-provider v0.32.2 ## explicit; go 1.23.0 k8s.io/cloud-provider k8s.io/cloud-provider/app/config @@ -1721,7 +1721,7 @@ k8s.io/cloud-provider/names k8s.io/cloud-provider/options k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/helpers -# k8s.io/component-base v0.32.1 => k8s.io/component-base v0.32.1 +# k8s.io/component-base v0.32.2 => k8s.io/component-base v0.32.2 ## explicit; go 1.23.0 k8s.io/component-base/cli/flag k8s.io/component-base/config @@ -1748,7 +1748,7 @@ k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/zpages/features k8s.io/component-base/zpages/flagz -# k8s.io/component-helpers v0.32.1 => k8s.io/component-helpers v0.32.1 +# k8s.io/component-helpers v0.32.2 => k8s.io/component-helpers v0.32.2 ## explicit; go 1.23.0 k8s.io/component-helpers/node/topology k8s.io/component-helpers/node/util/sysctl @@ -1757,7 +1757,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.32.1 => k8s.io/controller-manager v0.32.1 +# k8s.io/controller-manager v0.32.2 => k8s.io/controller-manager v0.32.2 ## explicit; go 1.23.0 k8s.io/controller-manager/config k8s.io/controller-manager/config/v1 @@ -1769,21 +1769,21 @@ k8s.io/controller-manager/pkg/features k8s.io/controller-manager/pkg/features/register k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.32.1 => k8s.io/cri-api v0.32.1 +# k8s.io/cri-api v0.32.2 => k8s.io/cri-api v0.32.2 ## explicit; go 1.23.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 -# k8s.io/cri-client v0.0.0 => k8s.io/cri-client v0.32.1 +# k8s.io/cri-client v0.0.0 => k8s.io/cri-client v0.32.2 ## explicit; go 1.23.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.32.1 +# k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.32.2 ## explicit; go 1.23.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => k8s.io/dynamic-resource-allocation v0.32.1 +# k8s.io/dynamic-resource-allocation v0.0.0 => k8s.io/dynamic-resource-allocation v0.32.2 ## explicit; go 1.23.0 k8s.io/dynamic-resource-allocation/api k8s.io/dynamic-resource-allocation/cel @@ -1800,7 +1800,7 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.32.1 +# k8s.io/kms v0.32.2 ## explicit; go 1.23.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 @@ -1828,15 +1828,15 @@ k8s.io/kube-openapi/pkg/validation/errors k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson -# k8s.io/kube-scheduler v0.0.0 => k8s.io/kube-scheduler v0.32.1 +# k8s.io/kube-scheduler v0.0.0 => k8s.io/kube-scheduler v0.32.2 ## explicit; go 1.23.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.32.1 +# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.32.2 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/scale k8s.io/kubectl/pkg/util/podutils -# k8s.io/kubelet v0.32.1 => k8s.io/kubelet v0.32.1 +# k8s.io/kubelet v0.32.2 => k8s.io/kubelet v0.32.2 ## explicit; go 1.23.0 k8s.io/kubelet/pkg/apis k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1 @@ -2005,10 +2005,10 @@ k8s.io/kubernetes/test/utils/kubeconfig k8s.io/kubernetes/third_party/forked/golang/expansion k8s.io/kubernetes/third_party/forked/libcontainer/apparmor k8s.io/kubernetes/third_party/forked/libcontainer/utils -# k8s.io/mount-utils v0.32.1 => k8s.io/mount-utils v0.29.3 +# k8s.io/mount-utils v0.32.2 => k8s.io/mount-utils v0.29.3 ## explicit; go 1.21 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.32.1 => k8s.io/pod-security-admission v0.32.1 +# k8s.io/pod-security-admission v0.32.2 => k8s.io/pod-security-admission v0.32.2 ## explicit; go 1.23.0 k8s.io/pod-security-admission/api k8s.io/pod-security-admission/policy @@ -2098,33 +2098,33 @@ sigs.k8s.io/yaml/goyaml.v2 # github.com/ceph/ceph-csi/api => ./api # 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.32.1 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1 -# k8s.io/apimachinery => k8s.io/apimachinery v0.32.1 -# k8s.io/apiserver => k8s.io/apiserver v0.32.1 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.1 -# k8s.io/client-go => k8s.io/client-go v0.32.1 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.1 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.1 -# k8s.io/code-generator => k8s.io/code-generator v0.32.1 -# k8s.io/component-base => k8s.io/component-base v0.32.1 -# k8s.io/component-helpers => k8s.io/component-helpers v0.32.1 -# k8s.io/controller-manager => k8s.io/controller-manager v0.32.1 -# k8s.io/cri-api => k8s.io/cri-api v0.32.1 -# k8s.io/cri-client => k8s.io/cri-client v0.32.1 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.1 -# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.1 -# k8s.io/endpointslice => k8s.io/endpointslice v0.32.1 -# k8s.io/externaljwt => k8s.io/externaljwt v0.32.1 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.1 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.1 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.1 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.1 -# k8s.io/kubectl => k8s.io/kubectl v0.32.1 -# k8s.io/kubelet => k8s.io/kubelet v0.32.1 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.1 -# k8s.io/metrics => k8s.io/metrics v0.32.1 +# k8s.io/api => k8s.io/api v0.32.2 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2 +# k8s.io/apimachinery => k8s.io/apimachinery v0.32.2 +# k8s.io/apiserver => k8s.io/apiserver v0.32.2 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2 +# k8s.io/client-go => k8s.io/client-go v0.32.2 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.2 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.2 +# k8s.io/code-generator => k8s.io/code-generator v0.32.2 +# k8s.io/component-base => k8s.io/component-base v0.32.2 +# k8s.io/component-helpers => k8s.io/component-helpers v0.32.2 +# k8s.io/controller-manager => k8s.io/controller-manager v0.32.2 +# k8s.io/cri-api => k8s.io/cri-api v0.32.2 +# k8s.io/cri-client => k8s.io/cri-client v0.32.2 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2 +# k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.2 +# k8s.io/endpointslice => k8s.io/endpointslice v0.32.2 +# k8s.io/externaljwt => k8s.io/externaljwt v0.32.2 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.2 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.2 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.2 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2 +# k8s.io/kubectl => k8s.io/kubectl v0.32.2 +# k8s.io/kubelet => k8s.io/kubelet v0.32.2 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.2 +# k8s.io/metrics => k8s.io/metrics v0.32.2 # k8s.io/mount-utils => k8s.io/mount-utils v0.29.3 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.1 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.1 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.2 # layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917