diff --git a/apis/vshn/v1/dbaas_vshn_postgresql.go b/apis/vshn/v1/dbaas_vshn_postgresql.go index 613e48f5a..63ec1bebd 100644 --- a/apis/vshn/v1/dbaas_vshn_postgresql.go +++ b/apis/vshn/v1/dbaas_vshn_postgresql.go @@ -90,14 +90,12 @@ type VSHNDBaaSSchedulingSpec struct { // VSHNDBaaSMaintenanceScheduleSpec contains settings to control the maintenance of an instance. type VSHNDBaaSMaintenanceScheduleSpec struct { // +kubebuilder:validation:Enum=monday;tuesday;wednesday;thursday;friday;saturday;sunday - // +kubebuilder:default="tuesday" // DayOfWeek specifies at which weekday the maintenance is held place. // Allowed values are [monday, tuesday, wednesday, thursday, friday, saturday, sunday] DayOfWeek string `json:"dayOfWeek,omitempty"` // +kubebuilder:validation:Pattern="^([0-1]?[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$" - // +kubebuilder:default="22:30:00" // TimeOfDay for installing updates in UTC. // Format: "hh:mm:ss". @@ -143,7 +141,6 @@ type VSHNDBaaSNetworkSpec struct { type VSHNPostgreSQLBackup struct { // +kubebuilder:validation:Pattern=^(\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\*\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\*|([0-9]|1[0-9]|2[0-3])|\*\/([0-9]|1[0-9]|2[0-3])) (\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\*\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$ - // +kubebuilder:default="0 22 * * *" Schedule string `json:"schedule,omitempty"` // +kubebuilder:validation:Pattern="^[1-9][0-9]*$" diff --git a/crds/vshn.appcat.vshn.io_vshnpostgresqls.yaml b/crds/vshn.appcat.vshn.io_vshnpostgresqls.yaml index 4e5f603e8..8491f71f3 100644 --- a/crds/vshn.appcat.vshn.io_vshnpostgresqls.yaml +++ b/crds/vshn.appcat.vshn.io_vshnpostgresqls.yaml @@ -43,7 +43,6 @@ spec: type: integer x-kubernetes-int-or-string: true schedule: - default: 0 22 * * * pattern: ^(\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\*\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\*|([0-9]|1[0-9]|2[0-3])|\*\/([0-9]|1[0-9]|2[0-3])) (\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\*\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$ type: string type: object @@ -59,7 +58,6 @@ spec: description: Maintenance contains settings to control the maintenance of an instance. properties: dayOfWeek: - default: tuesday description: DayOfWeek specifies at which weekday the maintenance is held place. Allowed values are [monday, tuesday, wednesday, thursday, friday, saturday, sunday] enum: - monday @@ -71,7 +69,6 @@ spec: - sunday type: string timeOfDay: - default: "22:30:00" description: 'TimeOfDay for installing updates in UTC. Format: "hh:mm:ss".' pattern: ^([0-1]?[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$ type: string diff --git a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml index e80f678d7..14fb84ddb 100644 --- a/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml +++ b/tests/golden/vshn/appcat/appcat/20_xrd_vshn_postgres.yaml @@ -52,7 +52,6 @@ spec: type: integer x-kubernetes-int-or-string: true schedule: - default: 0 22 * * * pattern: ^(\*|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])|\*\/([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])) (\*|([0-9]|1[0-9]|2[0-3])|\*\/([0-9]|1[0-9]|2[0-3])) (\*|([1-9]|1[0-9]|2[0-9]|3[0-1])|\*\/([1-9]|1[0-9]|2[0-9]|3[0-1])) (\*|([1-9]|1[0-2])|\*\/([1-9]|1[0-2])) (\*|([0-6])|\*\/([0-6]))$ @@ -73,7 +72,6 @@ spec: of an instance. properties: dayOfWeek: - default: tuesday description: DayOfWeek specifies at which weekday the maintenance is held place. Allowed values are [monday, tuesday, wednesday, thursday, friday, saturday, sunday] @@ -87,7 +85,6 @@ spec: - sunday type: string timeOfDay: - default: '22:30:00' description: 'TimeOfDay for installing updates in UTC. Format: "hh:mm:ss".' pattern: ^([0-1]?[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$