-
Notifications
You must be signed in to change notification settings - Fork 135
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #540 from fluxcd/refactor-events
Refactor events and introduce v1beta3 API for Alert and Provider
- Loading branch information
Showing
47 changed files
with
5,475 additions
and
1,623 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| Copyright 2023 The Flux authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1beta3 | ||
|
|
||
| import ( | ||
| "github.com/fluxcd/pkg/apis/meta" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
|
|
||
| v1 "github.com/fluxcd/notification-controller/api/v1" | ||
| ) | ||
|
|
||
| const ( | ||
| AlertKind string = "Alert" | ||
| ) | ||
|
|
||
| // AlertSpec defines an alerting rule for events involving a list of objects. | ||
| type AlertSpec struct { | ||
| // ProviderRef specifies which Provider this Alert should use. | ||
| // +required | ||
| ProviderRef meta.LocalObjectReference `json:"providerRef"` | ||
|
|
||
| // EventSeverity specifies how to filter events based on severity. | ||
| // If set to 'info' no events will be filtered. | ||
| // +kubebuilder:validation:Enum=info;error | ||
| // +kubebuilder:default:=info | ||
| // +optional | ||
| EventSeverity string `json:"eventSeverity,omitempty"` | ||
|
|
||
| // EventSources specifies how to filter events based | ||
| // on the involved object kind, name and namespace. | ||
| // +required | ||
| EventSources []v1.CrossNamespaceObjectReference `json:"eventSources"` | ||
|
|
||
| // InclusionList specifies a list of Golang regular expressions | ||
| // to be used for including messages. | ||
| // +optional | ||
| InclusionList []string `json:"inclusionList,omitempty"` | ||
|
|
||
| // EventMetadata is an optional field for adding metadata to events dispatched by the | ||
| // controller. This can be used for enhancing the context of the event. If a field | ||
| // would override one already present on the original event as generated by the emitter, | ||
| // then the override doesn't happen, i.e. the original value is preserved, and an info | ||
| // log is printed. | ||
| // +optional | ||
| EventMetadata map[string]string `json:"eventMetadata,omitempty"` | ||
|
|
||
| // ExclusionList specifies a list of Golang regular expressions | ||
| // to be used for excluding messages. | ||
| // +optional | ||
| ExclusionList []string `json:"exclusionList,omitempty"` | ||
|
|
||
| // Summary holds a short description of the impact and affected cluster. | ||
| // +kubebuilder:validation:MaxLength:=255 | ||
| // +optional | ||
| Summary string `json:"summary,omitempty"` | ||
|
|
||
| // Suspend tells the controller to suspend subsequent | ||
| // events handling for this Alert. | ||
| // +optional | ||
| Suspend bool `json:"suspend,omitempty"` | ||
| } | ||
|
|
||
| // +genclient | ||
| // +genclient:Namespaced | ||
| // +kubebuilder:storageversion | ||
| // +kubebuilder:object:root=true | ||
| // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="" | ||
|
|
||
| // Alert is the Schema for the alerts API | ||
| type Alert struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ObjectMeta `json:"metadata,omitempty"` | ||
|
|
||
| Spec AlertSpec `json:"spec,omitempty"` | ||
| } | ||
|
|
||
| //+kubebuilder:object:root=true | ||
|
|
||
| // AlertList contains a list of Alert | ||
| type AlertList struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ListMeta `json:"metadata,omitempty"` | ||
| Items []Alert `json:"items"` | ||
| } | ||
|
|
||
| func init() { | ||
| SchemeBuilder.Register(&Alert{}, &AlertList{}) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| Copyright 2023 The Flux authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| // Package v1beta3 contains API Schema definitions for the notification v1beta3 API group. | ||
| // +kubebuilder:object:generate=true | ||
| // +groupName=notification.toolkit.fluxcd.io | ||
| package v1beta3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| Copyright 2023 The Flux authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1beta3 | ||
|
|
||
| import ( | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| "sigs.k8s.io/controller-runtime/pkg/scheme" | ||
| ) | ||
|
|
||
| var ( | ||
| // GroupVersion is group version used to register these objects | ||
| GroupVersion = schema.GroupVersion{Group: "notification.toolkit.fluxcd.io", Version: "v1beta3"} | ||
|
|
||
| // SchemeBuilder is used to add go types to the GroupVersionKind scheme | ||
| SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} | ||
|
|
||
| // AddToScheme adds the types in this group-version to the given scheme. | ||
| AddToScheme = SchemeBuilder.AddToScheme | ||
| ) |
Oops, something went wrong.