Skip to content
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

Jump to bottom

SelinuxProfile: Remove apply flag from CRD #406

Merged
merged 1 commit into from
Apr 22, 2021
Merged

SelinuxProfile: Remove apply flag from CRD #406

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions api/selinuxprofile/v1alpha1/selinuxpolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ var _ profilebasev1alpha1.StatusBaseUser = &SelinuxProfile{}

// SelinuxProfileSpec defines the desired state of SelinuxProfile.
type SelinuxProfileSpec struct {
Apply bool `json:"apply,omitempty"`
Policy string `json:"policy,omitempty"`
}

Expand All @@ -45,7 +44,6 @@ type SelinuxProfileStatus struct {
// +kubebuilder:subresource:status
// +kubebuilder:resource:path=selinuxprofiles,scope=Namespaced
// +kubebuilder:printcolumn:name="Usage",type="string",JSONPath=`.status.usage`
// +kubebuilder:printcolumn:name="Apply",type="boolean",JSONPath=`.spec.apply`
// +kubebuilder:printcolumn:name="State",type="string",JSONPath=`.status.status`
type SelinuxProfile struct {
metav1.TypeMeta `json:",inline"`
Expand Down
5 changes: 0 additions & 5 deletions deploy/base/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,9 +476,6 @@ spec:
- jsonPath: .status.usage
name: Usage
type: string
- jsonPath: .spec.apply
name: Apply
type: boolean
- jsonPath: .status.status
name: State
type: string
Expand All @@ -502,8 +499,6 @@ spec:
spec:
description: SelinuxProfileSpec defines the desired state of SelinuxProfile.
properties:
apply:
type: boolean
policy:
type: string
type: object
Expand Down
5 changes: 0 additions & 5 deletions deploy/base/crds/selinuxpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ spec:
- jsonPath: .status.usage
name: Usage
type: string
- jsonPath: .spec.apply
name: Apply
type: boolean
- jsonPath: .status.status
name: State
type: string
Expand All @@ -46,8 +43,6 @@ spec:
spec:
description: SelinuxProfileSpec defines the desired state of SelinuxProfile.
properties:
apply:
type: boolean
policy:
type: string
type: object
Expand Down
5 changes: 0 additions & 5 deletions deploy/namespace-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,6 @@ spec:
- jsonPath: .status.usage
name: Usage
type: string
- jsonPath: .spec.apply
name: Apply
type: boolean
- jsonPath: .status.status
name: State
type: string
Expand All @@ -705,8 +702,6 @@ spec:
spec:
description: SelinuxProfileSpec defines the desired state of SelinuxProfile.
properties:
apply:
type: boolean
policy:
type: string
type: object
Expand Down
5 changes: 0 additions & 5 deletions deploy/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,6 @@ spec:
- jsonPath: .status.usage
name: Usage
type: string
- jsonPath: .spec.apply
name: Apply
type: boolean
- jsonPath: .status.status
name: State
type: string
Expand All @@ -705,8 +702,6 @@ spec:
spec:
description: SelinuxProfileSpec defines the desired state of SelinuxProfile.
properties:
apply:
type: boolean
policy:
type: string
type: object
Expand Down
1 change: 0 additions & 1 deletion examples/selinuxprofile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: SelinuxProfile
metadata:
name: errorlogger
spec:
apply: true
policy: |
(blockinherit container)
(allow process var_log_t ( dir ( open read getattr lock search ioctl add_name remove_name write )))
Expand Down
1 change: 0 additions & 1 deletion test/tc_selinux_base_usage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ kind: SelinuxProfile
metadata:
name: errorlogger
spec:
apply: true
policy: |
(blockinherit container)
(allow process var_log_t ( dir ( open read getattr lock search ioctl add_name remove_name write )))
Expand Down