diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 8bc4906d5..a5d943c0f 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -71,7 +71,7 @@ jobs:
- name: Run default status test
run: |
kubectl apply -f config/testdata/status-defaults
- for crd in alert provider receiver ; do
+ for crd in receiver ; do
RESULT=$(kubectl get ${crd} status-defaults -o go-template={{.status}})
EXPECTED='map[observedGeneration:-1]'
if [ "${RESULT}" != "${EXPECTED}" ] ; then
@@ -88,9 +88,6 @@ jobs:
- name: Run smoke tests
run: |
kubectl -n notification-system apply -f ./config/samples
- kubectl -n notification-system wait provider/slack-provider-sample --for=condition=ready --timeout=1m
- kubectl -n notification-system wait provider/generic-provider-sample --for=condition=ready --timeout=1m
- kubectl -n notification-system wait alert/alert-sample --for=condition=ready --timeout=1m
kubectl -n notification-system wait receiver/receiver-sample --for=condition=ready --timeout=1m
- name: Logs
run: |
diff --git a/Makefile b/Makefile
index e7a1480fe..b0f265377 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,7 @@ manifests: controller-gen
# Generate API reference documentation
api-docs: gen-crd-api-reference-docs
$(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1beta2 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/v1beta2/notification.md
+ $(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1beta3 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/v1beta3/notification.md
$(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/v1/notification.md
# Run go mod tidy
diff --git a/PROJECT b/PROJECT
index fa7a1babe..5bbd85678 100644
--- a/PROJECT
+++ b/PROJECT
@@ -1,3 +1,7 @@
+# Code generated by tool. DO NOT EDIT.
+# This file is used to track the info used to scaffold your project
+# and allow the plugins properly work.
+# More info: https://book.kubebuilder.io/reference/project-config.html
domain: toolkit.fluxcd.io
repo: github.com/fluxcd/notification-controller
resources:
@@ -22,4 +26,10 @@ resources:
- group: notification
kind: Receiver
version: v1beta2
+- group: notification
+ kind: Provider
+ version: v1beta3
+- group: notification
+ kind: Alert
+ version: v1beta3
version: "2"
diff --git a/api/v1beta1/alert_types.go b/api/v1beta1/alert_types.go
index 4cd9aac39..97bca9a99 100644
--- a/api/v1beta1/alert_types.go
+++ b/api/v1beta1/alert_types.go
@@ -70,6 +70,7 @@ type AlertStatus struct {
// +genclient:Namespaced
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
+// +kubebuilder:deprecatedversion:warning="v1beta1 Alert is deprecated, upgrade to v1beta3"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
diff --git a/api/v1beta1/provider_types.go b/api/v1beta1/provider_types.go
index e3622fed8..7cece20fb 100644
--- a/api/v1beta1/provider_types.go
+++ b/api/v1beta1/provider_types.go
@@ -113,6 +113,7 @@ type ProviderStatus struct {
// +genclient:Namespaced
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
+// +kubebuilder:deprecatedversion:warning="v1beta1 Provider is deprecated, upgrade to v1beta3"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
diff --git a/api/v1beta2/alert_types.go b/api/v1beta2/alert_types.go
index f39855acf..f270837c3 100644
--- a/api/v1beta2/alert_types.go
+++ b/api/v1beta2/alert_types.go
@@ -20,7 +20,7 @@ import (
"github.com/fluxcd/pkg/apis/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "github.com/fluxcd/notification-controller/api/v1"
+ v1 "github.com/fluxcd/notification-controller/api/v1"
)
const (
@@ -89,9 +89,9 @@ type AlertStatus struct {
// +genclient
// +genclient:Namespaced
-// +kubebuilder:storageversion
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
+// +kubebuilder:deprecatedversion:warning="v1beta2 Alert is deprecated, upgrade to v1beta3"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
diff --git a/api/v1beta2/provider_types.go b/api/v1beta2/provider_types.go
index 069b2d4b2..10604b831 100644
--- a/api/v1beta2/provider_types.go
+++ b/api/v1beta2/provider_types.go
@@ -132,9 +132,9 @@ type ProviderStatus struct {
// +genclient
// +genclient:Namespaced
-// +kubebuilder:storageversion
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
+// +kubebuilder:deprecatedversion:warning="v1beta2 Provider is deprecated, upgrade to v1beta3"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
diff --git a/api/v1beta3/alert_types.go b/api/v1beta3/alert_types.go
new file mode 100644
index 000000000..b3d4b691f
--- /dev/null
+++ b/api/v1beta3/alert_types.go
@@ -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{})
+}
diff --git a/api/v1beta3/doc.go b/api/v1beta3/doc.go
new file mode 100644
index 000000000..a6b71b4e5
--- /dev/null
+++ b/api/v1beta3/doc.go
@@ -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
diff --git a/api/v1beta3/groupversion_info.go b/api/v1beta3/groupversion_info.go
new file mode 100644
index 000000000..233c30e1d
--- /dev/null
+++ b/api/v1beta3/groupversion_info.go
@@ -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
+)
diff --git a/api/v1beta3/provider_types.go b/api/v1beta3/provider_types.go
new file mode 100644
index 000000000..8bf360f78
--- /dev/null
+++ b/api/v1beta3/provider_types.go
@@ -0,0 +1,149 @@
+/*
+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 (
+ "time"
+
+ "github.com/fluxcd/pkg/apis/meta"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+ ProviderKind string = "Provider"
+ GenericProvider string = "generic"
+ GenericHMACProvider string = "generic-hmac"
+ SlackProvider string = "slack"
+ GrafanaProvider string = "grafana"
+ DiscordProvider string = "discord"
+ MSTeamsProvider string = "msteams"
+ RocketProvider string = "rocket"
+ GitHubDispatchProvider string = "githubdispatch"
+ GitHubProvider string = "github"
+ GitLabProvider string = "gitlab"
+ GiteaProvider string = "gitea"
+ BitbucketServerProvider string = "bitbucketserver"
+ BitbucketProvider string = "bitbucket"
+ AzureDevOpsProvider string = "azuredevops"
+ GoogleChatProvider string = "googlechat"
+ GooglePubSubProvider string = "googlepubsub"
+ WebexProvider string = "webex"
+ SentryProvider string = "sentry"
+ AzureEventHubProvider string = "azureeventhub"
+ TelegramProvider string = "telegram"
+ LarkProvider string = "lark"
+ Matrix string = "matrix"
+ OpsgenieProvider string = "opsgenie"
+ AlertManagerProvider string = "alertmanager"
+ PagerDutyProvider string = "pagerduty"
+ DataDogProvider string = "datadog"
+)
+
+// ProviderSpec defines the desired state of the Provider.
+type ProviderSpec struct {
+ // Type specifies which Provider implementation to use.
+ // +kubebuilder:validation:Enum=slack;discord;msteams;rocket;generic;generic-hmac;github;gitlab;gitea;bitbucketserver;bitbucket;azuredevops;googlechat;googlepubsub;webex;sentry;azureeventhub;telegram;lark;matrix;opsgenie;alertmanager;grafana;githubdispatch;pagerduty;datadog
+ // +required
+ Type string `json:"type"`
+
+ // Channel specifies the destination channel where events should be posted.
+ // +kubebuilder:validation:MaxLength:=2048
+ // +optional
+ Channel string `json:"channel,omitempty"`
+
+ // Username specifies the name under which events are posted.
+ // +kubebuilder:validation:MaxLength:=2048
+ // +optional
+ Username string `json:"username,omitempty"`
+
+ // Address specifies the endpoint, in a generic sense, to where alerts are sent.
+ // What kind of endpoint depends on the specific Provider type being used.
+ // For the generic Provider, for example, this is an HTTP/S address.
+ // For other Provider types this could be a project ID or a namespace.
+ // +kubebuilder:validation:MaxLength:=2048
+ // +kubebuilder:validation:Optional
+ // +optional
+ Address string `json:"address,omitempty"`
+
+ // Timeout for sending alerts to the Provider.
+ // +kubebuilder:validation:Type=string
+ // +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m))+$"
+ // +optional
+ Timeout *metav1.Duration `json:"timeout,omitempty"`
+
+ // Proxy the HTTP/S address of the proxy server.
+ // +kubebuilder:validation:Pattern="^(http|https)://.*$"
+ // +kubebuilder:validation:MaxLength:=2048
+ // +kubebuilder:validation:Optional
+ // +optional
+ Proxy string `json:"proxy,omitempty"`
+
+ // SecretRef specifies the Secret containing the authentication
+ // credentials for this Provider.
+ // +optional
+ SecretRef *meta.LocalObjectReference `json:"secretRef,omitempty"`
+
+ // CertSecretRef specifies the Secret containing
+ // a PEM-encoded CA certificate (in the `ca.crt` key).
+ // +optional
+ //
+ // Note: Support for the `caFile` key has
+ // been deprecated.
+ CertSecretRef *meta.LocalObjectReference `json:"certSecretRef,omitempty"`
+
+ // Suspend tells the controller to suspend subsequent
+ // events handling for this Provider.
+ // +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=""
+
+// Provider is the Schema for the providers API
+type Provider struct {
+ metav1.TypeMeta `json:",inline"`
+ metav1.ObjectMeta `json:"metadata,omitempty"`
+
+ Spec ProviderSpec `json:"spec,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// ProviderList contains a list of Provider
+type ProviderList struct {
+ metav1.TypeMeta `json:",inline"`
+ metav1.ListMeta `json:"metadata,omitempty"`
+ Items []Provider `json:"items"`
+}
+
+func init() {
+ SchemeBuilder.Register(&Provider{}, &ProviderList{})
+}
+
+// GetTimeout returns the timeout value with a default of 15s for this Provider.
+func (in *Provider) GetTimeout() time.Duration {
+ duration := 15 * time.Second
+ if in.Spec.Timeout != nil {
+ duration = in.Spec.Timeout.Duration
+ }
+
+ return duration
+}
diff --git a/api/v1beta3/zz_generated.deepcopy.go b/api/v1beta3/zz_generated.deepcopy.go
new file mode 100644
index 000000000..8fe59857a
--- /dev/null
+++ b/api/v1beta3/zz_generated.deepcopy.go
@@ -0,0 +1,215 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+/*
+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.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package v1beta3
+
+import (
+ "github.com/fluxcd/notification-controller/api/v1"
+ "github.com/fluxcd/pkg/apis/meta"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Alert) DeepCopyInto(out *Alert) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+ in.Spec.DeepCopyInto(&out.Spec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Alert.
+func (in *Alert) DeepCopy() *Alert {
+ if in == nil {
+ return nil
+ }
+ out := new(Alert)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Alert) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AlertList) DeepCopyInto(out *AlertList) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
+ if in.Items != nil {
+ in, out := &in.Items, &out.Items
+ *out = make([]Alert, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AlertList.
+func (in *AlertList) DeepCopy() *AlertList {
+ if in == nil {
+ return nil
+ }
+ out := new(AlertList)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *AlertList) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *AlertSpec) DeepCopyInto(out *AlertSpec) {
+ *out = *in
+ out.ProviderRef = in.ProviderRef
+ if in.EventSources != nil {
+ in, out := &in.EventSources, &out.EventSources
+ *out = make([]v1.CrossNamespaceObjectReference, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+ if in.InclusionList != nil {
+ in, out := &in.InclusionList, &out.InclusionList
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+ if in.EventMetadata != nil {
+ in, out := &in.EventMetadata, &out.EventMetadata
+ *out = make(map[string]string, len(*in))
+ for key, val := range *in {
+ (*out)[key] = val
+ }
+ }
+ if in.ExclusionList != nil {
+ in, out := &in.ExclusionList, &out.ExclusionList
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AlertSpec.
+func (in *AlertSpec) DeepCopy() *AlertSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(AlertSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Provider) DeepCopyInto(out *Provider) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+ in.Spec.DeepCopyInto(&out.Spec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Provider.
+func (in *Provider) DeepCopy() *Provider {
+ if in == nil {
+ return nil
+ }
+ out := new(Provider)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Provider) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProviderList) DeepCopyInto(out *ProviderList) {
+ *out = *in
+ out.TypeMeta = in.TypeMeta
+ in.ListMeta.DeepCopyInto(&out.ListMeta)
+ if in.Items != nil {
+ in, out := &in.Items, &out.Items
+ *out = make([]Provider, len(*in))
+ for i := range *in {
+ (*in)[i].DeepCopyInto(&(*out)[i])
+ }
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProviderList.
+func (in *ProviderList) DeepCopy() *ProviderList {
+ if in == nil {
+ return nil
+ }
+ out := new(ProviderList)
+ in.DeepCopyInto(out)
+ return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ProviderList) DeepCopyObject() runtime.Object {
+ if c := in.DeepCopy(); c != nil {
+ return c
+ }
+ return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProviderSpec) DeepCopyInto(out *ProviderSpec) {
+ *out = *in
+ if in.Timeout != nil {
+ in, out := &in.Timeout, &out.Timeout
+ *out = new(metav1.Duration)
+ **out = **in
+ }
+ if in.SecretRef != nil {
+ in, out := &in.SecretRef, &out.SecretRef
+ *out = new(meta.LocalObjectReference)
+ **out = **in
+ }
+ if in.CertSecretRef != nil {
+ in, out := &in.CertSecretRef, &out.CertSecretRef
+ *out = new(meta.LocalObjectReference)
+ **out = **in
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProviderSpec.
+func (in *ProviderSpec) DeepCopy() *ProviderSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(ProviderSpec)
+ in.DeepCopyInto(out)
+ return out
+}
diff --git a/config/crd/bases/notification.toolkit.fluxcd.io_alerts.yaml b/config/crd/bases/notification.toolkit.fluxcd.io_alerts.yaml
index 9a97d35d7..9f52092f7 100644
--- a/config/crd/bases/notification.toolkit.fluxcd.io_alerts.yaml
+++ b/config/crd/bases/notification.toolkit.fluxcd.io_alerts.yaml
@@ -24,6 +24,8 @@ spec:
- jsonPath: .status.conditions[?(@.type=="Ready")].message
name: Status
type: string
+ deprecated: true
+ deprecationWarning: v1beta1 Alert is deprecated, upgrade to v1beta3
name: v1beta1
schema:
openAPIV3Schema:
@@ -218,6 +220,8 @@ spec:
- jsonPath: .status.conditions[?(@.type=="Ready")].message
name: Status
type: string
+ deprecated: true
+ deprecationWarning: v1beta2 Alert is deprecated, upgrade to v1beta3
name: v1beta2
schema:
openAPIV3Schema:
@@ -427,6 +431,137 @@ spec:
type: object
type: object
served: true
- storage: true
+ storage: false
subresources:
status: {}
+ - additionalPrinterColumns:
+ - jsonPath: .metadata.creationTimestamp
+ name: Age
+ type: date
+ name: v1beta3
+ schema:
+ openAPIV3Schema:
+ description: Alert is the Schema for the alerts API
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: AlertSpec defines an alerting rule for events involving a
+ list of objects.
+ properties:
+ eventMetadata:
+ additionalProperties:
+ type: string
+ description: 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.
+ type: object
+ eventSeverity:
+ default: info
+ description: EventSeverity specifies how to filter events based on
+ severity. If set to 'info' no events will be filtered.
+ enum:
+ - info
+ - error
+ type: string
+ eventSources:
+ description: EventSources specifies how to filter events based on
+ the involved object kind, name and namespace.
+ items:
+ description: CrossNamespaceObjectReference contains enough information
+ to let you locate the typed referenced object at cluster level
+ properties:
+ apiVersion:
+ description: API version of the referent
+ type: string
+ kind:
+ description: Kind of the referent
+ enum:
+ - Bucket
+ - GitRepository
+ - Kustomization
+ - HelmRelease
+ - HelmChart
+ - HelmRepository
+ - ImageRepository
+ - ImagePolicy
+ - ImageUpdateAutomation
+ - OCIRepository
+ type: string
+ matchLabels:
+ additionalProperties:
+ type: string
+ description: 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 operator
+ is "In", and the values array contains only "value". The requirements
+ are ANDed. MatchLabels requires the name to be set to `*`.
+ type: object
+ name:
+ description: Name of the referent If multiple resources are
+ targeted `*` may be set.
+ maxLength: 53
+ minLength: 1
+ type: string
+ namespace:
+ description: Namespace of the referent
+ maxLength: 53
+ minLength: 1
+ type: string
+ required:
+ - kind
+ - name
+ type: object
+ type: array
+ exclusionList:
+ description: ExclusionList specifies a list of Golang regular expressions
+ to be used for excluding messages.
+ items:
+ type: string
+ type: array
+ inclusionList:
+ description: InclusionList specifies a list of Golang regular expressions
+ to be used for including messages.
+ items:
+ type: string
+ type: array
+ providerRef:
+ description: ProviderRef specifies which Provider this Alert should
+ use.
+ properties:
+ name:
+ description: Name of the referent.
+ type: string
+ required:
+ - name
+ type: object
+ summary:
+ description: Summary holds a short description of the impact and affected
+ cluster.
+ maxLength: 255
+ type: string
+ suspend:
+ description: Suspend tells the controller to suspend subsequent events
+ handling for this Alert.
+ type: boolean
+ required:
+ - eventSources
+ - providerRef
+ type: object
+ type: object
+ served: true
+ storage: true
+ subresources: {}
diff --git a/config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml b/config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml
index 032076c16..cc229fb64 100644
--- a/config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml
+++ b/config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml
@@ -24,6 +24,8 @@ spec:
- jsonPath: .status.conditions[?(@.type=="Ready")].message
name: Status
type: string
+ deprecated: true
+ deprecationWarning: v1beta1 Provider is deprecated, upgrade to v1beta3
name: v1beta1
schema:
openAPIV3Schema:
@@ -207,6 +209,8 @@ spec:
- jsonPath: .status.conditions[?(@.type=="Ready")].message
name: Status
type: string
+ deprecated: true
+ deprecationWarning: v1beta2 Provider is deprecated, upgrade to v1beta3
name: v1beta2
schema:
openAPIV3Schema:
@@ -402,6 +406,118 @@ spec:
type: object
type: object
served: true
- storage: true
+ storage: false
subresources:
status: {}
+ - additionalPrinterColumns:
+ - jsonPath: .metadata.creationTimestamp
+ name: Age
+ type: date
+ name: v1beta3
+ schema:
+ openAPIV3Schema:
+ description: Provider is the Schema for the providers API
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: ProviderSpec defines the desired state of the Provider.
+ properties:
+ address:
+ description: Address specifies the endpoint, in a generic sense, to
+ where alerts are sent. What kind of endpoint depends on the specific
+ Provider type being used. For the generic Provider, for example,
+ this is an HTTP/S address. For other Provider types this could be
+ a project ID or a namespace.
+ maxLength: 2048
+ type: string
+ certSecretRef:
+ description: "CertSecretRef specifies the Secret containing a PEM-encoded
+ CA certificate (in the `ca.crt` key). \n Note: Support for the `caFile`
+ key has been deprecated."
+ properties:
+ name:
+ description: Name of the referent.
+ type: string
+ required:
+ - name
+ type: object
+ channel:
+ description: Channel specifies the destination channel where events
+ should be posted.
+ maxLength: 2048
+ type: string
+ proxy:
+ description: Proxy the HTTP/S address of the proxy server.
+ maxLength: 2048
+ pattern: ^(http|https)://.*$
+ type: string
+ secretRef:
+ description: SecretRef specifies the Secret containing the authentication
+ credentials for this Provider.
+ properties:
+ name:
+ description: Name of the referent.
+ type: string
+ required:
+ - name
+ type: object
+ suspend:
+ description: Suspend tells the controller to suspend subsequent events
+ handling for this Provider.
+ type: boolean
+ timeout:
+ description: Timeout for sending alerts to the Provider.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
+ type: string
+ type:
+ description: Type specifies which Provider implementation to use.
+ enum:
+ - slack
+ - discord
+ - msteams
+ - rocket
+ - generic
+ - generic-hmac
+ - github
+ - gitlab
+ - gitea
+ - bitbucketserver
+ - bitbucket
+ - azuredevops
+ - googlechat
+ - googlepubsub
+ - webex
+ - sentry
+ - azureeventhub
+ - telegram
+ - lark
+ - matrix
+ - opsgenie
+ - alertmanager
+ - grafana
+ - githubdispatch
+ - pagerduty
+ - datadog
+ type: string
+ username:
+ description: Username specifies the name under which events are posted.
+ maxLength: 2048
+ type: string
+ required:
+ - type
+ type: object
+ type: object
+ served: true
+ storage: true
+ subresources: {}
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 0511c55ac..cd7f85a95 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -47,14 +47,6 @@ rules:
- patch
- update
- watch
-- apiGroups:
- - notification.toolkit.fluxcd.io
- resources:
- - alerts/status
- verbs:
- - get
- - patch
- - update
- apiGroups:
- notification.toolkit.fluxcd.io
resources:
@@ -67,14 +59,6 @@ rules:
- patch
- update
- watch
-- apiGroups:
- - notification.toolkit.fluxcd.io
- resources:
- - providers/status
- verbs:
- - get
- - patch
- - update
- apiGroups:
- notification.toolkit.fluxcd.io
resources:
diff --git a/config/samples/notification_v1beta3_alert.yaml b/config/samples/notification_v1beta3_alert.yaml
new file mode 100644
index 000000000..2327bf051
--- /dev/null
+++ b/config/samples/notification_v1beta3_alert.yaml
@@ -0,0 +1,13 @@
+apiVersion: notification.toolkit.fluxcd.io/v1beta3
+kind: Alert
+metadata:
+ name: alert-sample
+spec:
+ providerRef:
+ name: slack-provider-sample
+ eventSeverity: info
+ eventSources:
+ - kind: GitRepository
+ name: '*'
+ - kind: Kustomization
+ name: '*'
diff --git a/config/samples/notification_v1beta3_provider.yaml b/config/samples/notification_v1beta3_provider.yaml
new file mode 100644
index 000000000..0a03795e7
--- /dev/null
+++ b/config/samples/notification_v1beta3_provider.yaml
@@ -0,0 +1,34 @@
+apiVersion: notification.toolkit.fluxcd.io/v1beta3
+kind: Provider
+metadata:
+ name: slack-provider-sample
+spec:
+ type: slack
+ channel: general
+ secretRef:
+ name: slack-url
+---
+apiVersion: v1
+kind: Secret
+metadata:
+ name: slack-url
+data:
+ address: aHR0cHM6Ly9ob29rcy5zbGFjay5jb20vc2VydmljZXMv
+---
+apiVersion: notification.toolkit.fluxcd.io/v1beta3
+kind: Provider
+metadata:
+ name: generic-provider-sample
+spec:
+ type: generic
+ address: https://api.github.com/repos/fluxcd/notification-controller/dispatches
+ secretRef:
+ name: generic-secret
+---
+apiVersion: v1
+kind: Secret
+metadata:
+ name: generic-secret
+stringData:
+ headers: |
+ Authorization: token
diff --git a/config/testdata/status-defaults/alert.yaml b/config/testdata/status-defaults/alert.yaml
deleted file mode 100644
index 40bec30ad..000000000
--- a/config/testdata/status-defaults/alert.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-apiVersion: notification.toolkit.fluxcd.io/v1beta1
-kind: Alert
-metadata:
- name: status-defaults
diff --git a/config/testdata/status-defaults/provider.yaml b/config/testdata/status-defaults/provider.yaml
deleted file mode 100644
index 27e8372fe..000000000
--- a/config/testdata/status-defaults/provider.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: notification.toolkit.fluxcd.io/v1beta1
-kind: Provider
-metadata:
- name: status-defaults
diff --git a/docs/api/v1beta3/notification.md b/docs/api/v1beta3/notification.md
new file mode 100644
index 000000000..2534fe2e2
--- /dev/null
+++ b/docs/api/v1beta3/notification.md
@@ -0,0 +1,644 @@
+Notification API reference v1beta3
+Packages:
+
+
+Package v1beta3 contains API Schema definitions for the notification v1beta3 API group.
+Resource Types:
+
+
+Alert is the Schema for the alerts API
+
+
+Provider is the Schema for the providers API
+
+
+
+(Appears on:
+Alert)
+
+AlertSpec defines an alerting rule for events involving a list of objects.
+
+
+
+(Appears on:
+Provider)
+
+ProviderSpec defines the desired state of the Provider.
+
+
+
This page was automatically generated with gen-crd-api-reference-docs
+