Merge pull request #574 from vshn/develop

🔀 Merge develop into master (Release)

Author: vshnbot

Makefile

@@ -79,6 +79,7 @@ generate:  get-crds generate-stackgres-crds generate-cnpg-crds protobuf-gen ## G
 	go version
 	rm -rf apis/generated
 	go run sigs.k8s.io/controller-tools/cmd/controller-gen paths="{./apis/v1/..., ./apis/vshn/..., ./apis/exoscale/..., ./apis/apiserver/..., ./apis/syntools/..., ./apis/codey/...}" object crd:crdVersions=v1,allowDangerousTypes=true output:artifacts:config=./apis/generated
+	go run sigs.k8s.io/controller-tools/cmd/controller-gen paths="./apis/cnpg/v1/..." object output:object:artifacts:config=./apis/cnpg/v1
 	go generate ./...
 	# Because yaml is such a fun and easy specification, we need to hack some things here.
 	# Depending on the yaml parser implementation the equal sign (=) has special meaning, or not...

apis/cnpg/v1/backups.go

@@ -0,0 +1,100 @@
+package v1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +kubebuilder:object:root=true
+
+// Backup is the API for creating one-off backups.
+// This is a partial reconstruction containing only fields we need for maintenance operations.
+type Backup struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Spec defines the desired state of a Backup.
+	Spec BackupSpec `json:"spec"`
+
+	// Status defines the status of a Backup.
+	Status BackupStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// BackupList contains a list of Backup resources.
+type BackupList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []Backup `json:"items"`
+}
+
+// BackupSpec defines the desired state of a Backup.
+type BackupSpec struct {
+	// Cluster is the reference to the PostgreSQL cluster to backup
+	Cluster BackupCluster `json:"cluster"`
+
+	// Method defines the backup method. Can be "barmanObjectStore" or "plugin"
+	Method BackupMethod `json:"method,omitempty"`
+
+	// Configuration parameters passed to the plugin managing this backup
+	PluginConfiguration `json:"pluginConfiguration,omitempty"`
+}
+
+// BackupCluster defines the cluster reference for a backup.
+type BackupCluster struct {
+	// Name of the cluster to backup
+	Name string `json:"name"`
+}
+
+// BackupMethod defines the backup method
+// +kubebuilder:validation:Enum=barmanObjectStore;plugin;volumeSnapshot
+type BackupMethod string
+
+const (
+	BackupMethodBarmanObjectStore BackupMethod = "barmanObjectStore"
+	BackupMethodPlugin            BackupMethod = "plugin"
+	BackupMethodVolumeSnapshot    BackupMethod = "volumeSnapshot"
+)
+
+type PluginConfiguration struct {
+	// Name is the name of the plugin managing this backup
+	Name string `json:"name"`
+	// Parameters are the configuration parameters passed to the backup plugin for this backup
+	Parameters map[string]string `json:"parameters,omitempty"`
+}
+
+// BackupStatus defines the observed state of a Backup.
+type BackupStatus struct {
+	// Phase describes the current phase of the backup
+	// +kubebuilder:validation:Enum=pending;running;completed;failed
+	Phase BackupPhase `json:"phase,omitempty"`
+
+	// Error contains error details if the backup failed
+	Error string `json:"error,omitempty"`
+
+	// StartedAt is the time when the backup was started
+	StartedAt *metav1.Time `json:"startedAt,omitempty"`
+
+	// StoppedAt is the time when the backup was stopped
+	StoppedAt *metav1.Time `json:"stoppedAt,omitempty"`
+
+	// BackupID is the backup identifier
+	BackupID string `json:"backupId,omitempty"`
+
+	// BackupName is the backup name in the object store
+	BackupName string `json:"backupName,omitempty"`
+
+	// DestinationPath is the path where the backup is stored
+	DestinationPath string `json:"destinationPath,omitempty"`
+}
+
+// BackupPhase defines the phase of the backup
+type BackupPhase string
+
+const (
+	BackupPhasePending   BackupPhase = "pending"
+	BackupPhaseRunning   BackupPhase = "running"
+	BackupPhaseCompleted BackupPhase = "completed"
+	BackupPhaseFailed    BackupPhase = "failed"
+)

apis/cnpg/v1/groupversion_info.go

@@ -26,5 +26,7 @@ func init() {
 		&ClusterList{},
 		&ImageCatalog{},
 		&ImageCatalogList{},
+		&Backup{},
+		&BackupList{},
 	)
 }

apis/cnpg/v1/zz_generated.deepcopy.go

@@ -38,31 +38,40 @@ type BillingServiceSpec struct {
 	Odoo OdooSpec `json:"odoo,omitempty"`
 }
 
+// ItemSpec defines a single billable product/item
+type ItemSpec struct {
+	// ProductID identifies the product in the billing system
+	ProductID string `json:"productID"`
+
+	// ItemDescription is a human-readable description of the billing item
+	ItemDescription string `json:"itemDescription,omitempty"`
+
+	// ItemGroupDescription describes the billing item group
+	ItemGroupDescription string `json:"itemGroupDescription,omitempty"`
+
+	// Unit defines the billing unit type for this product
+	Unit string `json:"unit,omitempty"`
+
+	// Value represents the billable metric for this product
+	// Can be: replica count, disk size (e.g., "50Gi"), percentage, etc.
+	Value string `json:"value"`
+}
+
 // OdooSpec defines Odoo-specific billing configuration
 type OdooSpec struct {
 	// InstanceID uniquely identifies the service instance in Odoo
 	InstanceID string `json:"instanceID"`
 
-	// ProductID identifies the product in the billing system
-	ProductID string `json:"productID"`
-
 	// 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"`
-
-	// Size represents the size of the service instance
-	Size string `json:"size,omitempty"`
-
-	// ItemGroupDescription describes the billing item group
-	ItemGroupDescription string `json:"itemGroupDescription"`
-
-	// ItemDescription is a human readable description of the billing item
-	ItemDescription string `json:"itemDescription"`
+	// Items defines list of billable products for this instance
+	// Each item represents a product with independent lifecycle and event tracking
+	// +kubebuilder:validation:MinItems=1
+	Items []ItemSpec `json:"items"`
 }
 
 // BillingServiceStatus defines the observed state of a BillingService
@@ -76,15 +85,25 @@ type BillingServiceStatus struct {
 
 // BillingEventStatus represents the status of a billing event
 type BillingEventStatus struct {
-	// Type is the type of billing event (created, deleted, scaled)
-	// +kubebuilder:validation:Enum="created";"deleted";"scaled"
+	// Type is the type of billing event (create, delete, scale)
+	// +kubebuilder:validation:Enum="create";"delete";"scale"
 	Type string `json:"type"`
 
 	// ProductID identifies the product in the billing system
 	ProductID string `json:"productId"`
 
-	// Size represents the size/plan at the time of the event
-	Size string `json:"size"`
+	// Value represents the billable metric at the time of the event
+	// Generic field supporting replica count, disk size, percentages, etc.
+	Value string `json:"value"`
+
+	// Unit defines the billing unit type for this product
+	Unit string `json:"unit,omitempty"`
+
+	// ItemDescription is a human-readable description of the billing item
+	ItemDescription string `json:"itemDescription,omitempty"`
+
+	// ItemGroupDescription describes the billing item group
+	ItemGroupDescription string `json:"itemGroupDescription,omitempty"`
 
 	// Timestamp when the event occurred
 	Timestamp metav1.Time `json:"timestamp"`