fluxcd
/
notification-controller
mirror of https://github.com/fluxcd/notification-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove interval default value from CRDs 

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan 2022-12-22 14:22:55 +02:00
parent 074072d0de
commit d57c09a0dd
No known key found for this signature in database
GPG Key ID: 3299AEB0E4085BAF
6 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/v1beta2/provider_types.go
View File

@ -57,7 +57,6 @@ type ProviderSpec struct {
Type string `json:"type"` Type string `json:"type"`
// Interval at which to reconcile the Provider with its Secret references. // Interval at which to reconcile the Provider with its Secret references.
// +kubebuilder:default="600s"
// +kubebuilder:validation:Type=string // +kubebuilder:validation:Type=string
// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$" // +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$"
// +optional // +optional

1
api/v1beta2/receiver_types.go
View File

@ -51,7 +51,6 @@ type ReceiverSpec struct {
Type string `json:"type"` Type string `json:"type"`
// Interval at which to reconcile the Receiver with its Secret references. // Interval at which to reconcile the Receiver with its Secret references.
// +kubebuilder:default="600s"
// +kubebuilder:validation:Type=string // +kubebuilder:validation:Type=string
// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$" // +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$"
// +optional // +optional

1
config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml
View File

@ -250,7 +250,6 @@ spec:
maxLength: 2048 maxLength: 2048
type: string type: string
interval: interval:
default: 600s
description: Interval at which to reconcile the Provider with its description: Interval at which to reconcile the Provider with its
Secret references. Secret references.
pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$

1
config/crd/bases/notification.toolkit.fluxcd.io_receivers.yaml
View File

@ -254,7 +254,6 @@ spec:
type: string type: string
type: array type: array
interval: interval:
default: 600s
description: Interval at which to reconcile the Receiver with its description: Interval at which to reconcile the Receiver with its
Secret references. Secret references.
pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$

1
controllers/provider_controller_test.go
View File

@ -74,7 +74,6 @@ func TestProviderReconciler_Reconcile(t *testing.T) {
g.Expect(conditions.Has(resultP, meta.ReconcilingCondition)).To(BeFalse()) g.Expect(conditions.Has(resultP, meta.ReconcilingCondition)).To(BeFalse())
g.Expect(controllerutil.ContainsFinalizer(resultP, apiv1.NotificationFinalizer)).To(BeTrue()) g.Expect(controllerutil.ContainsFinalizer(resultP, apiv1.NotificationFinalizer)).To(BeTrue())
g.Expect(resultP.Spec.Interval.Duration).To(BeIdenticalTo(10 * time.Minute))
}) })
t.Run("fails with secret not found error", func(t *testing.T) { t.Run("fails with secret not found error", func(t *testing.T) {

1
controllers/receiver_controller_test.go
View File

@ -102,7 +102,6 @@ func TestReceiverReconciler_Reconcile(t *testing.T) {
g.Expect(conditions.Has(resultR, meta.ReconcilingCondition)).To(BeFalse()) g.Expect(conditions.Has(resultR, meta.ReconcilingCondition)).To(BeFalse())
g.Expect(controllerutil.ContainsFinalizer(resultR, apiv1.NotificationFinalizer)).To(BeTrue()) g.Expect(controllerutil.ContainsFinalizer(resultR, apiv1.NotificationFinalizer)).To(BeTrue())
g.Expect(resultR.Spec.Interval.Duration).To(BeIdenticalTo(10 * time.Minute))
}) })
t.Run("fails with secret not found error", func(t *testing.T) { t.Run("fails with secret not found error", func(t *testing.T) {