update prerequisites command

Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>
This commit is contained in:
Matthias Bertschy
2025-02-26 11:20:33 +01:00
parent 75298eabf2
commit 75b295d579
3 changed files with 10 additions and 26 deletions

View File

@@ -4,6 +4,8 @@ import (
"github.com/kubescape/go-logger"
"github.com/kubescape/go-logger/helpers"
"github.com/kubescape/kubescape/v3/core/meta"
"github.com/kubescape/sizing-checker/pkg/checks/connectivitycheck"
"github.com/kubescape/sizing-checker/pkg/checks/ebpfcheck"
"github.com/kubescape/sizing-checker/pkg/checks/pvcheck"
"github.com/kubescape/sizing-checker/pkg/checks/sizing"
"github.com/kubescape/sizing-checker/pkg/common"
@@ -11,8 +13,6 @@ import (
)
func GetPreReqCmd(ks meta.IKubescape) *cobra.Command {
var activeChecks bool
// preReqCmd represents the prerequisites command
preReqCmd := &cobra.Command{
Use: "prerequisites",
@@ -31,32 +31,16 @@ func GetPreReqCmd(ks meta.IKubescape) *cobra.Command {
// 2) Run checks
sizingResult := sizing.RunSizingChecker(clusterData)
// Conditionally run resource-deploying checks
var pvResult *pvcheck.PVCheckResult
if activeChecks {
logger.L().Start("Running active checks")
pvResult = pvcheck.RunPVProvisioningCheck(ks.Context(), clientSet, clusterData)
logger.L().StopSuccess("Active checks complete")
} else {
// If not running active checks, fill with a "Skipped" result
pvResult = &pvcheck.PVCheckResult{
PassedCount: 0,
FailedCount: 0,
TotalNodes: len(clusterData.Nodes),
ResultMessage: "Skipped (use --active-checks to run)",
}
}
pvResult := pvcheck.RunPVProvisioningCheck(ks.Context(), clientSet, clusterData, inCluster)
connectivityResult := connectivitycheck.RunConnectivityChecks(ks.Context(), clientSet, clusterData, inCluster)
ebpfResult := ebpfcheck.RunEbpfCheck(ks.Context(), clientSet, clusterData, inCluster)
// 3) Build and export the final ReportData
finalReport := common.BuildReportData(clusterData, sizingResult)
finalReport.PVProvisioningMessage = pvResult.ResultMessage
finalReport := common.BuildReportData(clusterData, sizingResult, pvResult, connectivityResult, ebpfResult)
finalReport.InCluster = inCluster
common.GenerateOutput(finalReport, inCluster)
},
}
preReqCmd.PersistentFlags().BoolVarP(&activeChecks, "active-checks", "", false, "If set, run checks that require resource deployment on the cluster.")
return preReqCmd
}

2
go.mod
View File

@@ -34,7 +34,7 @@ require (
github.com/kubescape/opa-utils v0.0.286
github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520
github.com/kubescape/regolibrary/v2 v2.0.1
github.com/kubescape/sizing-checker v0.0.0-20250214150700-f76039e53ac3
github.com/kubescape/sizing-checker v0.0.0-20250225194755-bed52921170a
github.com/maruel/natural v1.1.1
github.com/matthyx/go-gitlog v0.0.0-20231005131906-9ffabe3c5bcd
github.com/mattn/go-isatty v0.0.20

4
go.sum
View File

@@ -1189,8 +1189,8 @@ github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520 h1:SqlwF8G
github.com/kubescape/rbac-utils v0.0.21-0.20230806101615-07e36f555520/go.mod h1:wuxMUSDzGUyWd25IJfBzEJ/Udmw2Vy7npj+MV3u3GrU=
github.com/kubescape/regolibrary/v2 v2.0.1 h1:7lKj171gslgTbbcmmGVHk34AZNqxForOXZIINoQfdzQ=
github.com/kubescape/regolibrary/v2 v2.0.1/go.mod h1:s0/Mi9PYw7s91vIf1VJTkuu1Blsl5ZLpYn5UA7yk/vM=
github.com/kubescape/sizing-checker v0.0.0-20250214150700-f76039e53ac3 h1:Dk+76gL/XoBVUaRfS2NOpIo+bPdkdqSdwGIMaFC2VxE=
github.com/kubescape/sizing-checker v0.0.0-20250214150700-f76039e53ac3/go.mod h1:xCg5Fh96STR7zQ3Tj2jrHi6oIMCwdwfr7ir5n1nJBQw=
github.com/kubescape/sizing-checker v0.0.0-20250225194755-bed52921170a h1:qduF+/rE+UY1saBlfmSM1b594qgByqCCHzw5s4es5X8=
github.com/kubescape/sizing-checker v0.0.0-20250225194755-bed52921170a/go.mod h1:xCg5Fh96STR7zQ3Tj2jrHi6oIMCwdwfr7ir5n1nJBQw=
github.com/kubescape/tablewriter v0.0.6-0.20231106230230-aac7d2659c94 h1:uhabZUyrxo60JQrzGCQOp1gsJz06+6+PeDBTvXiKD7k=
github.com/kubescape/tablewriter v0.0.6-0.20231106230230-aac7d2659c94/go.mod h1:clwQfF3MN2cpaf7R6hc84aB6fQsRr+bnm66pXXSNAv8=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=