From 442c97f138359f7003e75a41f33d1f920c0cada6 Mon Sep 17 00:00:00 2001 From: Matias Manavella Date: Mon, 31 Aug 2020 11:52:45 -0300 Subject: [PATCH 1/4] check Default SC --- pkg/analyze/storage_class.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/analyze/storage_class.go b/pkg/analyze/storage_class.go index 1f77a04f..e0629480 100644 --- a/pkg/analyze/storage_class.go +++ b/pkg/analyze/storage_class.go @@ -31,7 +31,8 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte } for _, storageClass := range storageClasses { - if storageClass.Name == analyzer.StorageClassName { + val, found := storageClass.Annotations["storageclass.kubernetes.io/is-default-class"] + if (storageClass.Name == analyzer.StorageClassName) || (analyzer.StorageClassName == "" && found && val == "true") { result.IsPass = true for _, outcome := range analyzer.Outcomes { if outcome.Pass != nil { From f7e4103d9b2010af9f0692295d08450518d27440 Mon Sep 17 00:00:00 2001 From: Matias Manavella Date: Mon, 31 Aug 2020 11:54:49 -0300 Subject: [PATCH 2/4] check Default SC --- pkg/analyze/storage_class.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/analyze/storage_class.go b/pkg/analyze/storage_class.go index e0629480..448d89ee 100644 --- a/pkg/analyze/storage_class.go +++ b/pkg/analyze/storage_class.go @@ -31,8 +31,8 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte } for _, storageClass := range storageClasses { - val, found := storageClass.Annotations["storageclass.kubernetes.io/is-default-class"] - if (storageClass.Name == analyzer.StorageClassName) || (analyzer.StorageClassName == "" && found && val == "true") { + val, _ := storageClass.Annotations["storageclass.kubernetes.io/is-default-class"] + if (storageClass.Name == analyzer.StorageClassName) || (analyzer.StorageClassName == "" && val == "true") { result.IsPass = true for _, outcome := range analyzer.Outcomes { if outcome.Pass != nil { From 8b1ae0194e9fd8a44aa948e2fb32a99c3d6285e1 Mon Sep 17 00:00:00 2001 From: Matias Manavella Date: Tue, 1 Sep 2020 18:36:55 -0300 Subject: [PATCH 3/4] check Default SC --- pkg/analyze/storage_class.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/analyze/storage_class.go b/pkg/analyze/storage_class.go index 448d89ee..10f1cd95 100644 --- a/pkg/analyze/storage_class.go +++ b/pkg/analyze/storage_class.go @@ -21,7 +21,11 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte title := analyzer.CheckName if title == "" { - title = fmt.Sprintf("Storage class %s", analyzer.StorageClassName) + if analyzer.StorageClassName != "" { + title = fmt.Sprintf("Storage class %s", analyzer.StorageClassName) + } else { + title = "Default Storage class" + } } result := AnalyzeResult{ @@ -40,6 +44,9 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte result.URI = outcome.Pass.URI } } + if analyzer.StorageClassName == "" && result.Message == "" { + result.Message = "Default Storage found" + } return &result, nil } @@ -52,6 +59,9 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte result.URI = outcome.Fail.URI } } + if analyzer.StorageClassName == "" && result.Message == "" { + result.Message = "Default Storage not found" + } return &result, nil } From 5522b0623c1a311ec5e0f9ae939c61e8f3f2366e Mon Sep 17 00:00:00 2001 From: Matias Manavella Date: Tue, 1 Sep 2020 19:07:13 -0300 Subject: [PATCH 4/4] check Default SC --- pkg/analyze/storage_class.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/analyze/storage_class.go b/pkg/analyze/storage_class.go index 10f1cd95..1c01b46b 100644 --- a/pkg/analyze/storage_class.go +++ b/pkg/analyze/storage_class.go @@ -24,7 +24,7 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte if analyzer.StorageClassName != "" { title = fmt.Sprintf("Storage class %s", analyzer.StorageClassName) } else { - title = "Default Storage class" + title = "Default Storage Class" } } @@ -45,7 +45,7 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte } } if analyzer.StorageClassName == "" && result.Message == "" { - result.Message = "Default Storage found" + result.Message = "Default Storage Class found" } return &result, nil @@ -60,7 +60,7 @@ func analyzeStorageClass(analyzer *troubleshootv1beta1.StorageClass, getCollecte } } if analyzer.StorageClassName == "" && result.Message == "" { - result.Message = "Default Storage not found" + result.Message = "No Default Storage Class found" } return &result, nil