Fix availabilityGroup panic; Set defults to logBackupOptions

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

Hide file tree

Showing 8 changed files with 18 additions and 30 deletions.
diff --git a/apis/archiver/v1alpha1/mariadbarchiver_types.go b/apis/archiver/v1alpha1/mariadbarchiver_types.go
@@ -59,7 +59,7 @@ type MariaDBArchiverSpec struct {
 	FullBackup *FullBackupOptions `json:"fullBackup"`
 	// LogBackup defines the sidekick configuration for the log backup
 	// +optional
-	LogBackup *LogBackupOptions `json:"logBackup"`
+	LogBackup LogBackupOptions `json:"logBackup"`
 	// ManifestBackup defines the session configuration for the manifest backup
 	// This options will eventually go to the manifest-backup job's yaml
 	// +optional

diff --git a/apis/archiver/v1alpha1/mongodbarchiver_types.go b/apis/archiver/v1alpha1/mongodbarchiver_types.go
@@ -60,7 +60,7 @@ type MongoDBArchiverSpec struct {
 	FullBackup *FullBackupOptions `json:"fullBackup"`
 	// LogBackup defines the sidekick configuration for the log backup
 	// +optional
-	LogBackup *LogBackupOptions `json:"logBackup"`
+	LogBackup LogBackupOptions `json:"logBackup"`
 	// ManifestBackup defines the sessionConfig of the manifestBackup
 	// This options will eventually go to the manifest-backup job's yaml
 	// +optional

diff --git a/apis/archiver/v1alpha1/mssqlserverarchiver_types.go b/apis/archiver/v1alpha1/mssqlserverarchiver_types.go
@@ -60,7 +60,7 @@ type MSSQLServerArchiverSpec struct {
 	FullBackup *FullBackupOptions `json:"fullBackup"`
 	// LogBackup defines the sidekick configuration for the log backup
 	// +optional
-	LogBackup *LogBackupOptions `json:"logBackup"`
+	LogBackup LogBackupOptions `json:"logBackup"`
 	// ManifestBackup defines the sessionConfig of the manifestBackup
 	// This options will eventually go to the manifest-backup job's yaml
 	// +optional

diff --git a/apis/archiver/v1alpha1/mysqlarchiver_types.go b/apis/archiver/v1alpha1/mysqlarchiver_types.go
@@ -60,7 +60,7 @@ type MySQLArchiverSpec struct {
 	FullBackup *FullBackupOptions `json:"fullBackup"`
 	// LogBackup defines the sidekick configuration for the log backup
 	// +optional
-	LogBackup *LogBackupOptions `json:"logBackup"`
+	LogBackup LogBackupOptions `json:"logBackup"`
 	// ManifestBackup defines the sessionConfig of the manifestBackup
 	// This options will eventually go to the manifest-backup job's yaml
 	// +optional

diff --git a/apis/archiver/v1alpha1/openapi_generated.go b/apis/archiver/v1alpha1/openapi_generated.go
diff --git a/apis/archiver/v1alpha1/postgresarchiver_types.go b/apis/archiver/v1alpha1/postgresarchiver_types.go
@@ -60,7 +60,7 @@ type PostgresArchiverSpec struct {
 	FullBackup *FullBackupOptions `json:"fullBackup"`
 	// LogBackup defines the sidekick configuration for the log backup
 	// +optional
-	LogBackup *LogBackupOptions `json:"logBackup"`
+	LogBackup LogBackupOptions `json:"logBackup"`
 	// ManifestBackup defines the sessionConfig of the manifestBackup
 	// This options will eventually go to the manifest-backup job's yaml
 	// +optional

diff --git a/apis/archiver/v1alpha1/zz_generated.deepcopy.go b/apis/archiver/v1alpha1/zz_generated.deepcopy.go
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