Fix availabilityGroup panic; Set defults to logBackupOptions (#1370)

Signed-off-by: Arnob kumar saha <[email protected]>
kubedb · Dec 18, 2024 · e9eda10 · e9eda10
1 parent a471a5b
commit e9eda10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/apis/archiver/v1alpha1/helpers.go b/apis/archiver/v1alpha1/helpers.go
@@ -45,3 +45,13 @@ func (_ MariaDBArchiver) CustomResourceDefinition() *apiextensions.CustomResourc
 func (_ MSSQLServerArchiver) CustomResourceDefinition() *apiextensions.CustomResourceDefinition {
 	return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourcePluralMSSQLServerArchiver))
 }
+
+func SetDefaultLogBackupOptions(log *LogBackupOptions) *LogBackupOptions {
+	if log == nil {
+		log = &LogBackupOptions{
+			SuccessfulLogHistoryLimit: 5,
+			FailedLogHistoryLimit:     5,
+		}
+	}
+	return log
+}
diff --git a/apis/kubedb/v1alpha2/mssqlserver_helpers.go b/apis/kubedb/v1alpha2/mssqlserver_helpers.go
@@ -343,6 +343,9 @@ func (m *MSSQLServer) SetDefaults() {
 			m.Spec.Replicas = pointer.Int32P(1)
 		}
 	} else if m.IsAvailabilityGroup() {
+		if m.Spec.Topology.AvailabilityGroup == nil {
+			m.Spec.Topology.AvailabilityGroup = &MSSQLServerAvailabilityGroupSpec{}
+		}
 		if m.Spec.Topology.AvailabilityGroup.LeaderElection == nil {
 			m.Spec.Topology.AvailabilityGroup.LeaderElection = &MSSQLServerLeaderElectionConfig{
 				// The upper limit of election timeout is 50000ms (50s), which should only be used when deploying a