From 244a1dedcd24094756f4a7d0414ff625dd57ebd4 Mon Sep 17 00:00:00 2001 From: Bobby Brennan Date: Thu, 2 May 2019 19:18:29 +0000 Subject: [PATCH] DeploymentResult -> ControllerResult --- pkg/validator/deployment.go | 9 +++++---- pkg/validator/types.go | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkg/validator/deployment.go b/pkg/validator/deployment.go index 2583462f..fe6a516c 100644 --- a/pkg/validator/deployment.go +++ b/pkg/validator/deployment.go @@ -21,11 +21,12 @@ import ( ) // ValidateDeployment validates a single deployment, returns a PodResult. -func ValidateDeployment(conf conf.Configuration, deploy *appsv1.Deployment) DeploymentResult { +func ValidateDeployment(conf conf.Configuration, deploy *appsv1.Deployment) ControllerResult { pod := deploy.Spec.Template.Spec podResult := ValidatePod(conf, &pod) - return DeploymentResult{ + return ControllerResult{ Name: deploy.Name, + Type: "Deployment", PodResult: podResult, } } @@ -47,7 +48,7 @@ func ValidateDeployments(config conf.Configuration, k8sAPI *kube.API) (Namespace return nsResults, nil } -func addResult(deploymentResult DeploymentResult, nsResults NamespacedResults, nsName string) NamespacedResults { +func addResult(deploymentResult ControllerResult, nsResults NamespacedResults, nsName string) NamespacedResults { nsResult := &NamespaceResult{} // If there is already data stored for this namespace name, @@ -56,7 +57,7 @@ func addResult(deploymentResult DeploymentResult, nsResults NamespacedResults, n case nil: nsResult = &NamespaceResult{ Summary: &ResultSummary{}, - DeploymentResults: []DeploymentResult{}, + DeploymentResults: []ControllerResult{}, } nsResults[nsName] = nsResult default: diff --git a/pkg/validator/types.go b/pkg/validator/types.go index 2c35f18b..d570c7de 100644 --- a/pkg/validator/types.go +++ b/pkg/validator/types.go @@ -35,7 +35,7 @@ type NamespacedResults map[string]*NamespaceResult type NamespaceResult struct { Name string Summary *ResultSummary - DeploymentResults []DeploymentResult + DeploymentResults []ControllerResult } // CountSummary provides a high level overview of success, warnings, and errors. @@ -73,9 +73,10 @@ func (rs *ResultSummary) appendResults(toAppend ResultSummary) { } } -// DeploymentResult provides a wrapper around a PodResult -type DeploymentResult struct { +// ControllerResult provides a wrapper around a PodResult +type ControllerResult struct { Name string + Type string PodResult PodResult }