upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-09 00:34:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

change GetFullQualifiedPluginNameForVolume to distinuish different drivers

Browse source 
Change-Id: Iaeafa67215565f7f4906fc2b683c8a231bee8e90
This commit is contained in:
jornshen 2020-10-27 10:36:29 +08:00 committed by Matthew Cary
parent 5f1e5cafd3
commit c7b1e3d756
3 changed files with 103 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/volume/util/BUILD
View file

@ -22,6 +22,7 @@ go_library(
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/v1/pod:go_default_library",
"//pkg/apis/core/v1/helper:go_default_library",
"//pkg/features:go_default_library",
"//pkg/securitycontext:go_default_library",
"//pkg/util/resizefs:go_default_library",
"//pkg/volume:go_default_library",
@ -38,6 +39,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/component-base/metrics:go_default_library",
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
@ -54,6 +56,7 @@ go_test(
"atomic_writer_test.go",
"attach_limit_test.go",
"device_util_linux_test.go",
"metrics_test.go",
"nested_volumes_test.go",
"resize_util_test.go",
"util_test.go",

11
pkg/volume/util/metrics.go
View file

@ -20,8 +20,10 @@ import (
"fmt"
"time"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/component-base/metrics"
"k8s.io/component-base/metrics/legacyregistry"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/volume"
)
@ -115,8 +117,13 @@ func OperationCompleteHook(plugin, operationName string) func(*error) {
// between metrics emitted for CSI volumes which may be handled by different
// CSI plugin drivers.
func GetFullQualifiedPluginNameForVolume(pluginName string, spec *volume.Spec) string {
if spec != nil && spec.PersistentVolume != nil && spec.PersistentVolume.Spec.CSI != nil {
return fmt.Sprintf("%s:%s", pluginName, spec.PersistentVolume.Spec.CSI.Driver)
if spec != nil {
if spec.Volume != nil && spec.Volume.CSI != nil && utilfeature.DefaultFeatureGate.Enabled(features.CSIInlineVolume) {
return fmt.Sprintf("%s:%s", pluginName, spec.Volume.CSI.Driver)
}
if spec.PersistentVolume != nil && spec.PersistentVolume.Spec.CSI != nil {
return fmt.Sprintf("%s:%s", pluginName, spec.PersistentVolume.Spec.CSI.Driver)
}
}
return pluginName
}

91
pkg/volume/util/metrics_test.go Normal file
View file

@ -0,0 +1,91 @@
/*
Copyright 2020 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package util
import (
"fmt"
"testing"
v1 "k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/volume"
)
func TestGetFullQualifiedPluginNameForVolume(t *testing.T) {
var (
fakePluginName = "kubernetes.io/fakePlugin"
fakeInlineCSIDriverName = "fake.inline.csi.driver"
fakeCSIDriverName = "fake.csi.driver"
)
testCase := []struct {
name string
pluginName string
spec *volume.Spec
wantFullName string
}{
{
name: "get full qualified plugin name without volume spec",
pluginName: fakePluginName,
spec: nil,
wantFullName: fakePluginName,
},
{
name: "get full qualified plugin name without using CSI plugin",
pluginName: fakePluginName,
spec: &volume.Spec{},
wantFullName: fakePluginName,
},
{
name: "get full qualified plugin name with CSI ephemeral volume",
pluginName: fakePluginName,
spec: &volume.Spec{
Volume: &v1.Volume{
VolumeSource: v1.VolumeSource{
CSI: &v1.CSIVolumeSource{
Driver: fakeInlineCSIDriverName,
},
},
},
},
wantFullName: fmt.Sprintf("%s:%s", fakePluginName, fakeInlineCSIDriverName),
},
{
name: "get full qualified plugin name with CSI PV",
pluginName: fakePluginName,
spec: &volume.Spec{
PersistentVolume: &v1.PersistentVolume{
Spec: v1.PersistentVolumeSpec{
PersistentVolumeSource: v1.PersistentVolumeSource{
CSI: &v1.CSIPersistentVolumeSource{
Driver: fakeCSIDriverName,
},
},
},
},
},
wantFullName: fmt.Sprintf("%s:%s", fakePluginName, fakeCSIDriverName),
},
}
for _, test := range testCase {
t.Run(test.name, func(t *testing.T) {
if fullPluginName := GetFullQualifiedPluginNameForVolume(test.pluginName, test.spec); fullPluginName != test.wantFullName {
t.Errorf("Case name: %s, GetFullQualifiedPluginNameForVolume, pluginName:%s, spec: %v, return:%s, want:%s", test.name, test.pluginName, test.spec, fullPluginName, test.wantFullName)
}
})
}
}