mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 10:33:35 +00:00
rebase: update remaining kubernetes.io packages to v0.32.2
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
committed by
mergify[bot]
mergify[bot]
parent
229603a8ea
commit
75c70e158f
74
vendor/k8s.io/csi-translation-lib/plugins/portworx.go
generated
vendored
74
vendor/k8s.io/csi-translation-lib/plugins/portworx.go
generated
vendored
@ -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
|
||||
|
||||
94
vendor/modules.txt
vendored
94
vendor/modules.txt
vendored
@ -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
|
||||
|
||||
Reference in New Issue
Block a user