diff --git a/apis/management.cattle.io/v3/cluster_scan_types.go b/apis/management.cattle.io/v3/cluster_scan_types.go index 5a6cbc87..37cb7de2 100644 --- a/apis/management.cattle.io/v3/cluster_scan_types.go +++ b/apis/management.cattle.io/v3/cluster_scan_types.go @@ -24,7 +24,6 @@ const ( DefaultSonobuoyPodName = "security-scan-runner" ConfigMapNameForUserConfig = "security-scan-cfg" - RunCisScanAnnotation = "field.cattle.io/runCisScan" SonobuoyCompletionAnnotation = "field.cattle.io/sonobuoyDone" CisHelmChartOwner = "field.cattle.io/clusterScanOwner" diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index f9e72d69..cc094779 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -156,6 +156,7 @@ type ClusterStatus struct { IstioEnabled bool `json:"istioEnabled,omitempty" norman:"nocreate,noupdate,default=false"` CertificatesExpiration map[string]CertExpiration `json:"certificatesExpiration,omitempty"` ScheduledClusterScanStatus *ScheduledClusterScanStatus `json:"scheduledClusterScanStatus,omitempty"` + CurrentCisRunName string `json:"currentCisRunName,omitempty"` } type ClusterComponentStatus struct { diff --git a/client/management/v3/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go index 9a6a7275..7ff6e917 100644 --- a/client/management/v3/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -28,6 +28,7 @@ const ( ClusterFieldConditions = "conditions" ClusterFieldCreated = "created" ClusterFieldCreatorID = "creatorId" + ClusterFieldCurrentCisRunName = "currentCisRunName" ClusterFieldDefaultClusterRoleForProjectMembers = "defaultClusterRoleForProjectMembers" ClusterFieldDefaultPodSecurityPolicyTemplateID = "defaultPodSecurityPolicyTemplateId" ClusterFieldDescription = "description" @@ -87,6 +88,7 @@ type Cluster struct { Conditions []ClusterCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + CurrentCisRunName string `json:"currentCisRunName,omitempty" yaml:"currentCisRunName,omitempty"` DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" yaml:"defaultClusterRoleForProjectMembers,omitempty"` DefaultPodSecurityPolicyTemplateID string `json:"defaultPodSecurityPolicyTemplateId,omitempty" yaml:"defaultPodSecurityPolicyTemplateId,omitempty"` Description string `json:"description,omitempty" yaml:"description,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_status.go b/client/management/v3/zz_generated_cluster_status.go index 0c2980fe..0402afc7 100644 --- a/client/management/v3/zz_generated_cluster_status.go +++ b/client/management/v3/zz_generated_cluster_status.go @@ -16,6 +16,7 @@ const ( ClusterStatusFieldCertificatesExpiration = "certificatesExpiration" ClusterStatusFieldComponentStatuses = "componentStatuses" ClusterStatusFieldConditions = "conditions" + ClusterStatusFieldCurrentCisRunName = "currentCisRunName" ClusterStatusFieldDriver = "driver" ClusterStatusFieldFailedSpec = "failedSpec" ClusterStatusFieldIstioEnabled = "istioEnabled" @@ -42,6 +43,7 @@ type ClusterStatus struct { CertificatesExpiration map[string]CertExpiration `json:"certificatesExpiration,omitempty" yaml:"certificatesExpiration,omitempty"` ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty" yaml:"componentStatuses,omitempty"` Conditions []ClusterCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` + CurrentCisRunName string `json:"currentCisRunName,omitempty" yaml:"currentCisRunName,omitempty"` Driver string `json:"driver,omitempty" yaml:"driver,omitempty"` FailedSpec *ClusterSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` IstioEnabled bool `json:"istioEnabled,omitempty" yaml:"istioEnabled,omitempty"`