rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-12 17:55:20 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1062 from leodotcloud/cis

Browse Source 
rename skip to overrideSkip
This commit is contained in:
Dan Ramich 2019-12-17 14:42:29 -07:00 committed by GitHub
commit b0c77ca096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ const (
type CisScanConfig struct {
// IDs of the checks that need to be skipped in the final report
Skip string `json:"skip,omitempty"`
OverrideSkip []string `json:"overrideSkip"`
// Override the CIS benchmark version to use for the scan (instead of latest)
OverrideBenchmarkVersion string `json:"overrideBenchmarkVersion,omitempty"`
// Internal flag for debugging master component of the scan

7
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@ -927,6 +927,11 @@ func (in *ChangePasswordInput) DeepCopy() *ChangePasswordInput {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *CisScanConfig) DeepCopyInto(out *CisScanConfig) {
*out = *in
if in.OverrideSkip != nil {
in, out := &in.OverrideSkip, &out.OverrideSkip
*out = make([]string, len(*in))
copy(*out, *in)
}
return
}
@ -1919,7 +1924,7 @@ func (in *ClusterScanConfig) DeepCopyInto(out *ClusterScanConfig) {
if in.CisScanConfig != nil {
in, out := &in.CisScanConfig, &out.CisScanConfig
*out = new(CisScanConfig)
**out = **in
(*in).DeepCopyInto(*out)
}
return
}

10
client/management/v3/zz_generated_cis_scan_config.go
View File

@ -5,12 +5,12 @@ const (
CisScanConfigFieldDebugMaster = "debugMaster"
CisScanConfigFieldDebugWorker = "debugWorker"
CisScanConfigFieldOverrideBenchmarkVersion = "overrideBenchmarkVersion"
CisScanConfigFieldSkip = "skip"
CisScanConfigFieldOverrideSkip = "overrideSkip"
)
type CisScanConfig struct {
DebugMaster bool `json:"debugMaster,omitempty" yaml:"debugMaster,omitempty"`
DebugWorker bool `json:"debugWorker,omitempty" yaml:"debugWorker,omitempty"`
OverrideBenchmarkVersion string `json:"overrideBenchmarkVersion,omitempty" yaml:"overrideBenchmarkVersion,omitempty"`
Skip string `json:"skip,omitempty" yaml:"skip,omitempty"`
DebugMaster bool `json:"debugMaster,omitempty" yaml:"debugMaster,omitempty"`
DebugWorker bool `json:"debugWorker,omitempty" yaml:"debugWorker,omitempty"`
OverrideBenchmarkVersion string `json:"overrideBenchmarkVersion,omitempty" yaml:"overrideBenchmarkVersion,omitempty"`
OverrideSkip []string `json:"overrideSkip,omitempty" yaml:"overrideSkip,omitempty"`
}