Merge pull request #514 from vshn/develop

🔀 Merge develop into master (Release)

Author: vshnbot

apis/apiserver/v1/generated.pb.go

@@ -112,15 +112,15 @@ func New() *VSHNPostgresBackup {
 	return &VSHNPostgresBackup{}
 }
 
-// SGBackupInfo holds necessary data for VSHNPostgresBackup
-type SGBackupInfo struct {
+// BackupInfo holds necessary data for VSHNPostgresBackup
+type BackupInfo struct {
 	metav1.ObjectMeta
 	Process           runtime.RawExtension
 	BackupInformation runtime.RawExtension
 }
 
-// NewVSHNPostgresBackup creates a new VSHNPostgresBackup out of a SGBackupInfo and a database instance
-func NewVSHNPostgresBackup(backup *SGBackupInfo, db, originalNamespace string) *VSHNPostgresBackup {
+// NewVSHNPostgresBackup creates a new VSHNPostgresBackup out of a BackupInfo and a database instance
+func NewVSHNPostgresBackup(backup *BackupInfo, db, originalNamespace string) *VSHNPostgresBackup {
 	if backup == nil || originalNamespace == "" || db == "" {
 		return nil
 	}

apis/apiserver/v1/vshn_postgres_backup_types.go

@@ -1,34 +1,35 @@
 package v1
 
 import (
+	"testing"
+
 	"gotest.tools/v3/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
-	"testing"
 )
 
 func TestNewVSHNBackupFromBackInfo(t *testing.T) {
 	tests := map[string]struct {
 		db                 string
 		namespace          string
-		backupInfo         *SGBackupInfo
+		backupInfo         *BackupInfo
 		vshnPostgresBackup *VSHNPostgresBackup
 	}{
 		"GivenNoBackupInfo_ThenNil": {
 			db:        "db1",
 			namespace: "namespace",
 		},
 		"GivenNoDB_ThenNil": {
-			backupInfo: &SGBackupInfo{
+			backupInfo: &BackupInfo{
 				ObjectMeta:        metav1.ObjectMeta{Name: "backup"},
 				Process:           *rawFromObject(getTestProcess()),
 				BackupInformation: *rawFromObject(getTestBI()),
 			},
 			namespace: "namespace",
 		},
 		"GivenNoNamespace_ThenNil": {
-			backupInfo: &SGBackupInfo{
+			backupInfo: &BackupInfo{
 				ObjectMeta:        metav1.ObjectMeta{Name: "backup"},
 				Process:           *rawFromObject(getTestProcess()),
 				BackupInformation: *rawFromObject(getTestBI()),
@@ -38,7 +39,7 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) {
 		"GivenBackupInfo_ThenVSHNBackup": {
 			db:        "db1",
 			namespace: "namespace",
-			backupInfo: &SGBackupInfo{
+			backupInfo: &BackupInfo{
 				ObjectMeta:        metav1.ObjectMeta{Name: "backup"},
 				Process:           *rawFromObject(getTestProcess()),
 				BackupInformation: *rawFromObject(getTestBI()),
@@ -55,7 +56,7 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) {
 		"GivenBackupInfoWithNoProcess_ThenVSHNBackup": {
 			db:        "db1",
 			namespace: "namespace",
-			backupInfo: &SGBackupInfo{
+			backupInfo: &BackupInfo{
 				ObjectMeta:        metav1.ObjectMeta{Name: "backup"},
 				BackupInformation: *rawFromObject(getTestBI()),
 			},
@@ -70,7 +71,7 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) {
 		"GivenBackupInfoWithNoBI_ThenVSHNBackup": {
 			db:        "db1",
 			namespace: "namespace",
-			backupInfo: &SGBackupInfo{
+			backupInfo: &BackupInfo{
 				ObjectMeta: metav1.ObjectMeta{Name: "backup"},
 				Process:    *rawFromObject(getTestProcess()),
 			},

apis/apiserver/v1/vshn_postgres_backup_types_test.go

@@ -49,6 +49,9 @@ type OdooSpec struct {
 	// SalesOrderID identifies the sales order in Odoo
 	SalesOrderID string `json:"salesOrderID,omitempty"`
 
+	// Organization used to identify sales order
+	Organization string `json:"organization,omitempty"`
+
 	// UnitID defines the billing unit type in Odoo
 	UnitID string `json:"unitID"`
 

apis/apiserver/v1/zz_generated.deepcopy.go

@@ -182,11 +182,25 @@ type VSHNMonitoring struct {
 
 	// Email necessary to send alerts via email
 	Email string `json:"email,omitempty"`
-	// VSHNScheduleStatus keeps track of the maintenance and backup schedules.
-	// As of Crossplane 1.14 it's no longer allowed to change the composite.spec, so
-	// any generate
 }
 
+// InitialMaintenanceStatus tracks the status of the initial maintenance job.
+// It records when the job ran and whether it succeeded or failed.
+type InitialMaintenanceStatus struct {
+	// CompletedAt is the timestamp when the initial maintenance job completed.
+	// This field is set regardless of whether the job succeeded or failed.
+	// +optional
+	CompletedAt *string `json:"completedAt,omitempty"`
+
+	// Success indicates whether the initial maintenance job completed successfully.
+	// True if the job succeeded, false if it failed.
+	// +optional
+	Success *bool `json:"success,omitempty"`
+}
+
+// VSHNScheduleStatus keeps track of the maintenance and backup schedules.
+// As of Crossplane 1.14 it's no longer allowed to change the composite.spec, so
+// any generated schedules are stored in the status.
 type VSHNScheduleStatus struct {
 	// Maintenance keeps track of the maintenance schedule.
 	Maintenance VSHNDBaaSMaintenanceScheduleSpec `json:"maintenance,omitempty"`

apis/vshn/v1/billing_service.go

@@ -165,6 +165,9 @@ type VSHNForgejoStatus struct {
 	// Schedules keeps track of random generated schedules, is overwriten by
 	// schedules set in the service's spec.
 	Schedules VSHNScheduleStatus `json:"schedules,omitempty"`
+	// InitialMaintenance tracks the status of the initial maintenance job,
+	// including when it ran and whether it succeeded or failed.
+	InitialMaintenance InitialMaintenanceStatus `json:"initialMaintenance,omitempty"`
 
 	// ResourceStatus represents the observed state of a managed resource.
 	xpv1.ResourceStatus `json:",inline"`
@@ -182,6 +185,22 @@ func (v *VSHNForgejo) SetInstanceNamespaceStatus() {
 	v.Status.InstanceNamespace = v.GetInstanceNamespace()
 }
 
+func (v *VSHNForgejo) GetInitialMaintenanceRan() bool {
+	return v.Status.InitialMaintenance.CompletedAt != nil
+}
+
+func (v *VSHNForgejo) GetInitialMaintenanceCompletedAt() string {
+	if v.Status.InitialMaintenance.CompletedAt != nil {
+		return *v.Status.InitialMaintenance.CompletedAt
+	}
+	return ""
+}
+
+func (v *VSHNForgejo) SetInitialMaintenanceStatus(completedAt string, success bool) {
+	v.Status.InitialMaintenance.CompletedAt = &completedAt
+	v.Status.InitialMaintenance.Success = &success
+}
+
 // +kubebuilder:object:generate=true
 // +kubebuilder:object:root=true
 

apis/vshn/v1/common_types.go

@@ -223,6 +223,9 @@ type VSHNKeycloakStatus struct {
 	// Schedules keeps track of random generated schedules, is overwriten by
 	// schedules set in the service's spec.
 	Schedules VSHNScheduleStatus `json:"schedules,omitempty"`
+	// InitialMaintenance tracks the status of the initial maintenance job,
+	// including when it ran and whether it succeeded or failed.
+	InitialMaintenance InitialMaintenanceStatus `json:"initialMaintenance,omitempty"`
 	// ResourceStatus represents the observed state of a managed resource.
 	xpv1.ResourceStatus `json:",inline"`
 	// LastConfigHash is the hash of last applied customConfigurationRef.
@@ -251,6 +254,22 @@ func (v *VSHNKeycloak) SetInstanceNamespaceStatus() {
 	v.Status.InstanceNamespace = v.GetInstanceNamespace()
 }
 
+func (v *VSHNKeycloak) GetInitialMaintenanceRan() bool {
+	return v.Status.InitialMaintenance.CompletedAt != nil
+}
+
+func (v *VSHNKeycloak) GetInitialMaintenanceCompletedAt() string {
+	if v.Status.InitialMaintenance.CompletedAt != nil {
+		return *v.Status.InitialMaintenance.CompletedAt
+	}
+	return ""
+}
+
+func (v *VSHNKeycloak) SetInitialMaintenanceStatus(completedAt string, success bool) {
+	v.Status.InitialMaintenance.CompletedAt = &completedAt
+	v.Status.InitialMaintenance.Success = &success
+}
+
 func (v *VSHNKeycloak) GetLastConfigHash() string {
 	return v.Status.LastConfigHash
 }

apis/vshn/v1/dbaas_vshn_forgejo.go

@@ -147,8 +147,9 @@ type VSHNMariaDBStatus struct {
 	CurrentInstances int `json:"currentInstances,omitempty"`
 	// MariaDBVersion contains the current MariaDB server version
 	MariaDBVersion string `json:"mariadbVersion,omitempty"`
-	// InitialMaintenanceRan tracks if the initial maintenance job has been triggered
-	InitialMaintenanceRan bool `json:"initialMaintenanceRan,omitempty"`
+	// InitialMaintenance tracks the status of the initial maintenance job,
+	// including when it ran and whether it succeeded or failed.
+	InitialMaintenance InitialMaintenanceStatus `json:"initialMaintenance,omitempty"`
 	// ResourceStatus represents the observed state of a managed resource.
 	xpv1.ResourceStatus `json:",inline"`
 }
@@ -169,6 +170,22 @@ func (v *VSHNMariaDB) SetInstanceNamespaceStatus() {
 	v.Status.InstanceNamespace = v.GetInstanceNamespace()
 }
 
+func (v *VSHNMariaDB) GetInitialMaintenanceRan() bool {
+	return v.Status.InitialMaintenance.CompletedAt != nil
+}
+
+func (v *VSHNMariaDB) GetInitialMaintenanceCompletedAt() string {
+	if v.Status.InitialMaintenance.CompletedAt != nil {
+		return *v.Status.InitialMaintenance.CompletedAt
+	}
+	return ""
+}
+
+func (v *VSHNMariaDB) SetInitialMaintenanceStatus(completedAt string, success bool) {
+	v.Status.InitialMaintenance.CompletedAt = &completedAt
+	v.Status.InitialMaintenance.Success = &success
+}
+
 // +kubebuilder:object:generate=true
 // +kubebuilder:object:root=true
 

apis/vshn/v1/dbaas_vshn_keycloak.go

@@ -285,6 +285,9 @@ type VSHNPostgreSQLStatus struct {
 	// Schedules keeps track of random generated schedules, is overwriten by
 	// schedules set in the service's spec.
 	Schedules VSHNScheduleStatus `json:"schedules,omitempty"`
+	// InitialMaintenance tracks the status of the initial maintenance job,
+	// including when it ran and whether it succeeded or failed.
+	InitialMaintenance InitialMaintenanceStatus `json:"initialMaintenance,omitempty"`
 	// ResourceStatus represents the observed state of a managed resource.
 	xpv1.ResourceStatus `json:",inline"`
 }
@@ -373,7 +376,8 @@ type XVSHNPostgreSQLStatus struct {
 
 type XVSHNPostgreSQLSpec struct {
 	// Parameters are the configurable fields of a VSHNPostgreSQL.
-	Parameters        VSHNPostgreSQLParameters `json:"parameters,omitempty"`
+	Parameters        VSHNPostgreSQLParameters  `json:"parameters,omitempty"`
+	CompositionRef    cpv1.CompositionReference `json:"compositionRef,omitempty"`
 	xpv1.ResourceSpec `json:",inline"`
 }
 
@@ -396,6 +400,22 @@ func (v *VSHNPostgreSQL) SetInstanceNamespaceStatus() {
 	v.Status.InstanceNamespace = v.GetInstanceNamespace()
 }
 
+func (v *VSHNPostgreSQL) GetInitialMaintenanceRan() bool {
+	return v.Status.InitialMaintenance.CompletedAt != nil
+}
+
+func (v *VSHNPostgreSQL) GetInitialMaintenanceCompletedAt() string {
+	if v.Status.InitialMaintenance.CompletedAt != nil {
+		return *v.Status.InitialMaintenance.CompletedAt
+	}
+	return ""
+}
+
+func (v *VSHNPostgreSQL) SetInitialMaintenanceStatus(completedAt string, success bool) {
+	v.Status.InitialMaintenance.CompletedAt = &completedAt
+	v.Status.InitialMaintenance.Success = &success
+}
+
 func (v *XVSHNPostgreSQL) GetInstanceNamespace() string {
 	return fmt.Sprintf("vshn-postgresql-%s", v.GetName())
 }