diff --git a/api/v1beta2/provider_types.go b/api/v1beta2/provider_types.go index 8bfb4f7..ba08b1e 100644 --- a/api/v1beta2/provider_types.go +++ b/api/v1beta2/provider_types.go @@ -57,7 +57,6 @@ type ProviderSpec struct { Type string `json:"type"` // Interval at which to reconcile the Provider with its Secret references. - // +kubebuilder:default="600s" // +kubebuilder:validation:Type=string // +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$" // +optional diff --git a/api/v1beta2/receiver_types.go b/api/v1beta2/receiver_types.go index e0cf689..d52a499 100644 --- a/api/v1beta2/receiver_types.go +++ b/api/v1beta2/receiver_types.go @@ -51,7 +51,6 @@ type ReceiverSpec struct { Type string `json:"type"` // Interval at which to reconcile the Receiver with its Secret references. - // +kubebuilder:default="600s" // +kubebuilder:validation:Type=string // +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$" // +optional diff --git a/config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml b/config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml index dabaa12..5ca7a49 100644 --- a/config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml +++ b/config/crd/bases/notification.toolkit.fluxcd.io_providers.yaml @@ -250,7 +250,6 @@ spec: maxLength: 2048 type: string interval: - default: 600s description: Interval at which to reconcile the Provider with its Secret references. pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ diff --git a/config/crd/bases/notification.toolkit.fluxcd.io_receivers.yaml b/config/crd/bases/notification.toolkit.fluxcd.io_receivers.yaml index 3837d81..17367b2 100644 --- a/config/crd/bases/notification.toolkit.fluxcd.io_receivers.yaml +++ b/config/crd/bases/notification.toolkit.fluxcd.io_receivers.yaml @@ -254,7 +254,6 @@ spec: type: string type: array interval: - default: 600s description: Interval at which to reconcile the Receiver with its Secret references. pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$ diff --git a/controllers/provider_controller_test.go b/controllers/provider_controller_test.go index a29bc25..689d21d 100644 --- a/controllers/provider_controller_test.go +++ b/controllers/provider_controller_test.go @@ -74,7 +74,6 @@ func TestProviderReconciler_Reconcile(t *testing.T) { g.Expect(conditions.Has(resultP, meta.ReconcilingCondition)).To(BeFalse()) 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) { diff --git a/controllers/receiver_controller_test.go b/controllers/receiver_controller_test.go index f0b3047..0f12346 100644 --- a/controllers/receiver_controller_test.go +++ b/controllers/receiver_controller_test.go @@ -102,7 +102,6 @@ func TestReceiverReconciler_Reconcile(t *testing.T) { g.Expect(conditions.Has(resultR, meta.ReconcilingCondition)).To(BeFalse()) 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) {