rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-05-08 07:06:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request from StrongMonkey/cis-fix

Browse Source 
Move CIS annotation to status
This commit is contained in:
Daishan Peng 2020-03-19 08:48:46 -07:00 committed by GitHub
commit 36d43b5937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 1 deletions

1
apis/management.cattle.io/v3/cluster_scan_types.go
View File

@ -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"

1
apis/management.cattle.io/v3/cluster_types.go
View File

@ -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 {

2
client/management/v3/zz_generated_cluster.go
View File

@ -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"`

2
client/management/v3/zz_generated_cluster_status.go
View File

@ -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"`