Merge branch 'master' into logging-dev
This commit is contained in:
@@ -62,6 +62,10 @@ func (*persistentVolumeClaimSearcher) match(match map[string]string, item *v1.Pe
|
||||
if !sliceutil.HasString(statuses, pvcStatus(item)) {
|
||||
return false
|
||||
}
|
||||
case storageClassName:
|
||||
if item.Spec.StorageClassName == nil || *item.Spec.StorageClassName != v {
|
||||
return false
|
||||
}
|
||||
case Keyword:
|
||||
if !strings.Contains(item.Name, v) && !searchFuzzy(item.Labels, "", v) && !searchFuzzy(item.Annotations, "", v) {
|
||||
return false
|
||||
|
||||
@@ -70,6 +70,7 @@ const (
|
||||
Keyword = "keyword"
|
||||
Status = "status"
|
||||
includeCronJob = "includeCronJob"
|
||||
storageClassName = "storageClassName"
|
||||
cronJobKind = "CronJob"
|
||||
s2iRunKind = "S2iRun"
|
||||
includeS2iRun = "includeS2iRun"
|
||||
|
||||
Reference in New Issue
Block a user