Skip to content

Add defaults for cascading inherit fields and disable omitEmpty #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J12934 merged 1 commit into from
Oct 1, 2021
Merged

Add defaults for cascading inherit fields and disable omitEmpty #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions operator/apis/execution/v1/scan_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,23 @@ import (
type CascadeSpec struct {
// InheritLabels defines whether cascading scans should inherit labels from the parent scan
// +optional
InheritLabels bool `json:"inheritLabels,omitempty"`
// +kubebuilder:default=true
InheritLabels bool `json:"inheritLabels"`

// InheritAnnotations defines whether cascading scans should inherit annotations from the parent scan
// +optional
InheritAnnotations bool `json:"inheritAnnotations,omitempty"`
// +kubebuilder:default=true
InheritAnnotations bool `json:"inheritAnnotations"`

// InheritEnv defines whether cascading scans should inherit environment variables from the parent scan
// +optional
InheritEnv bool `json:"inheritEnv,omitempty"`
// +kubebuilder:default=false
InheritEnv bool `json:"inheritEnv"`

// InheritVolumes defines whether cascading scans should inherit volumes and volume mounts from the parent scan
// +optional
InheritVolumes bool `json:"inheritVolumes,omitempty"`
// +kubebuilder:default=false
InheritVolumes bool `json:"inheritVolumes"`

// matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
// map is equivalent to an element of matchExpressions, whose key field is "key", the
Expand Down
4 changes: 4 additions & 0 deletions operator/config/crd/bases/cascading.securecodebox.io_cascadingrules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,22 @@ spec:
should be generated.
properties:
inheritAnnotations:
default: true
description: InheritAnnotations defines whether cascading
scans should inherit annotations from the parent scan
type: boolean
inheritEnv:
default: false
description: InheritEnv defines whether cascading scans should
inherit environment variables from the parent scan
type: boolean
inheritLabels:
default: true
description: InheritLabels defines whether cascading scans
should inherit labels from the parent scan
type: boolean
inheritVolumes:
default: false
description: InheritVolumes defines whether cascading scans
should inherit volumes and volume mounts from the parent
scan
Expand Down
4 changes: 4 additions & 0 deletions operator/config/crd/bases/execution.securecodebox.io_scans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,22 @@ spec:
be generated.
properties:
inheritAnnotations:
default: true
description: InheritAnnotations defines whether cascading scans
should inherit annotations from the parent scan
type: boolean
inheritEnv:
default: false
description: InheritEnv defines whether cascading scans should
inherit environment variables from the parent scan
type: boolean
inheritLabels:
default: true
description: InheritLabels defines whether cascading scans should
inherit labels from the parent scan
type: boolean
inheritVolumes:
default: false
description: InheritVolumes defines whether cascading scans should
inherit volumes and volume mounts from the parent scan
type: boolean
Expand Down
4 changes: 4 additions & 0 deletions operator/config/crd/bases/execution.securecodebox.io_scheduledscans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,22 @@ spec:
should be generated.
properties:
inheritAnnotations:
default: true
description: InheritAnnotations defines whether cascading
scans should inherit annotations from the parent scan
type: boolean
inheritEnv:
default: false
description: InheritEnv defines whether cascading scans should
inherit environment variables from the parent scan
type: boolean
inheritLabels:
default: true
description: InheritLabels defines whether cascading scans
should inherit labels from the parent scan
type: boolean
inheritVolumes:
default: false
description: InheritVolumes defines whether cascading scans
should inherit volumes and volume mounts from the parent
scan
Expand Down
4 changes: 4 additions & 0 deletions operator/crds/cascading.securecodebox.io_cascadingrules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,22 @@ spec:
should be generated.
properties:
inheritAnnotations:
default: true
description: InheritAnnotations defines whether cascading
scans should inherit annotations from the parent scan
type: boolean
inheritEnv:
default: false
description: InheritEnv defines whether cascading scans should
inherit environment variables from the parent scan
type: boolean
inheritLabels:
default: true
description: InheritLabels defines whether cascading scans
should inherit labels from the parent scan
type: boolean
inheritVolumes:
default: false
description: InheritVolumes defines whether cascading scans
should inherit volumes and volume mounts from the parent
scan
Expand Down
4 changes: 4 additions & 0 deletions operator/crds/execution.securecodebox.io_scans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,22 @@ spec:
be generated.
properties:
inheritAnnotations:
default: true
description: InheritAnnotations defines whether cascading scans
should inherit annotations from the parent scan
type: boolean
inheritEnv:
default: false
description: InheritEnv defines whether cascading scans should
inherit environment variables from the parent scan
type: boolean
inheritLabels:
default: true
description: InheritLabels defines whether cascading scans should
inherit labels from the parent scan
type: boolean
inheritVolumes:
default: false
description: InheritVolumes defines whether cascading scans should
inherit volumes and volume mounts from the parent scan
type: boolean
Expand Down
4 changes: 4 additions & 0 deletions operator/crds/execution.securecodebox.io_scheduledscans.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,22 @@ spec:
should be generated.
properties:
inheritAnnotations:
default: true
description: InheritAnnotations defines whether cascading
scans should inherit annotations from the parent scan
type: boolean
inheritEnv:
default: false
description: InheritEnv defines whether cascading scans should
inherit environment variables from the parent scan
type: boolean
inheritLabels:
default: true
description: InheritLabels defines whether cascading scans
should inherit labels from the parent scan
type: boolean
inheritVolumes:
default: false
description: InheritVolumes defines whether cascading scans
should inherit volumes and volume mounts from the parent
scan
Expand Down