Skip to content

Commit d2bc571

Browse files
authored
Merge pull request #250 from manavellamnimble/defaultStorageClass
Check for Default Storage Class when storageClassName is empty
2 parents 2289e00 + 5522b06 commit d2bc571

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

pkg/analyze/storage_class.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ func analyzeStorageClass(analyzer *troubleshootv1beta2.StorageClass, getCollecte
2121

2222
title := analyzer.CheckName
2323
if title == "" {
24-
title = fmt.Sprintf("Storage class %s", analyzer.StorageClassName)
24+
if analyzer.StorageClassName != "" {
25+
title = fmt.Sprintf("Storage class %s", analyzer.StorageClassName)
26+
} else {
27+
title = "Default Storage Class"
28+
}
2529
}
2630

2731
result := AnalyzeResult{
@@ -31,14 +35,18 @@ func analyzeStorageClass(analyzer *troubleshootv1beta2.StorageClass, getCollecte
3135
}
3236

3337
for _, storageClass := range storageClasses {
34-
if storageClass.Name == analyzer.StorageClassName {
38+
val, _ := storageClass.Annotations["storageclass.kubernetes.io/is-default-class"]
39+
if (storageClass.Name == analyzer.StorageClassName) || (analyzer.StorageClassName == "" && val == "true") {
3540
result.IsPass = true
3641
for _, outcome := range analyzer.Outcomes {
3742
if outcome.Pass != nil {
3843
result.Message = outcome.Pass.Message
3944
result.URI = outcome.Pass.URI
4045
}
4146
}
47+
if analyzer.StorageClassName == "" && result.Message == "" {
48+
result.Message = "Default Storage Class found"
49+
}
4250

4351
return &result, nil
4452
}
@@ -51,6 +59,9 @@ func analyzeStorageClass(analyzer *troubleshootv1beta2.StorageClass, getCollecte
5159
result.URI = outcome.Fail.URI
5260
}
5361
}
62+
if analyzer.StorageClassName == "" && result.Message == "" {
63+
result.Message = "No Default Storage Class found"
64+
}
5465

5566
return &result, nil
5667
}

0 commit comments

Comments
 (0)