Merge pull request #31 from prachidamle/reopen_fix

prachidamle · web-flow · commit c1d19275d6f6 · 2020-09-17T19:12:49.000-07:00
Clear any previous conditions before running the scan
diff --git a/pkg/securityscan/scanHandler.go b/pkg/securityscan/scanHandler.go
@@ -18,6 +18,7 @@ import (
 	cisctlv1 "github.com/rancher/cis-operator/pkg/generated/controllers/cis.cattle.io/v1"
 	ciscore "github.com/rancher/cis-operator/pkg/securityscan/core"
 	cisjob "github.com/rancher/cis-operator/pkg/securityscan/job"
+	"github.com/rancher/wrangler/pkg/genericcondition"
 	"k8s.io/apimachinery/pkg/labels"
 )
 
@@ -51,6 +52,10 @@ func (c *Controller) handleClusterScans(ctx context.Context) error {
 					return objects, obj.Status, nil
 				}
 
+				obj.Status.Conditions = []genericcondition.GenericCondition{}
+				v1.ClusterScanConditionPending.True(obj)
+				v1.ClusterScanConditionPending.Message(obj, "ClusterScan run pending")
+
 				if err := c.isRunnerPodPresent(); err != nil {
 					return objects, obj.Status, fmt.Errorf("Retrying ClusterScan %v since got error: %v ", obj.Name, err)
 				}

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import (`
`18`	`18`	`cisctlv1 "github.com/rancher/cis-operator/pkg/generated/controllers/cis.cattle.io/v1"`
`19`	`19`	`ciscore "github.com/rancher/cis-operator/pkg/securityscan/core"`
`20`	`20`	`cisjob "github.com/rancher/cis-operator/pkg/securityscan/job"`
	`21`	`+ "github.com/rancher/wrangler/pkg/genericcondition"`
`21`	`22`	`"k8s.io/apimachinery/pkg/labels"`
`22`	`23`	`)`
`23`	`24`
`@@ -51,6 +52,10 @@ func (c *Controller) handleClusterScans(ctx context.Context) error {`
`51`	`52`	`return objects, obj.Status, nil`
`52`	`53`	`}`
`53`	`54`
	`55`	`+ obj.Status.Conditions = []genericcondition.GenericCondition{}`
	`56`	`+ v1.ClusterScanConditionPending.True(obj)`
	`57`	`+ v1.ClusterScanConditionPending.Message(obj, "ClusterScan run pending")`
	`58`	`+`
`54`	`59`	`if err := c.isRunnerPodPresent(); err != nil {`
`55`	`60`	`return objects, obj.Status, fmt.Errorf("Retrying ClusterScan %v since got error: %v ", obj.Name, err)`
`56`	`61`	`}`