Skip to content

Commit

Permalink
Merge pull request #417 from rhmdnd/fix-minor-formatting-issues
Browse files Browse the repository at this point in the history
Fix minor formatting issues
  • Loading branch information
openshift-merge-robot authored Sep 18, 2023
2 parents 124e8d6 + 8604e8a commit f6bfa3f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/manager/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ func handleServiceMonitor(ctx context.Context, cfg *rest.Config, mClient *moncli

// createNonComplianceAlert tries to create the default PrometheusRule. Returns nil.
func createNonComplianceAlert(ctx context.Context, client *monclientv1.MonitoringV1Client, namespace string) error {
duration := monitoring.Duration("1s")
duration := monitoring.Duration("1s")
rule := monitoring.Rule{
Alert: "NonCompliant",
Expr: intstr.FromString(`compliance_operator_compliance_state{name=~".+"} > 0`),
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/compliance/v1alpha1/scansettingbinding_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ type ScanSettingBinding struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec ScanSettingBindingSpec `json:"spec,omitempty"`
Profiles []NamedObjectReference `json:"profiles,omitempty"`
// +kubebuilder:default={"name":"default","kind": "ScanSetting", "apiGroup": "compliance.openshift.io/v1alpha1"}
SettingsRef *NamedObjectReference `json:"settingsRef,omitempty"`
Spec ScanSettingBindingSpec `json:"spec,omitempty"`
Profiles []NamedObjectReference `json:"profiles,omitempty"`
// +kubebuilder:default={"name":"default","kind": "ScanSetting", "apiGroup": "compliance.openshift.io/v1alpha1"}
SettingsRef *NamedObjectReference `json:"settingsRef,omitempty"`
// +optional
Status ScanSettingBindingStatus `json:"status,omitempty"`
}
Expand Down

0 comments on commit f6bfa3f

Please sign in to comment.