Merge pull request #1062 from leodotcloud/cis

rename skip to overrideSkip

apis/management.cattle.io/v3/cluster_scan_types.go

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

apis/management.cattle.io/v3/zz_generated_deepcopy.go

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