Merge pull request #500 from vshn/develop

🔀 Merge develop into master (Release)

Author: vshnbot

apis/codey/dbaas_vshn_codey.go

@@ -137,10 +137,15 @@ func (v *CodeyInstance) GetAllowedNamespaces() []string {
 func (v *CodeyInstance) GetBackupRetention() vshnv1.K8upRetentionPolicy {
 	return vshnv1.K8upRetentionPolicy{}
 }
+
 func (v *CodeyInstance) GetBackupSchedule() string {
 	return ""
 }
 
+func (v *CodeyInstance) IsBackupEnabled() bool {
+	return false
+}
+
 func (v *CodeyInstance) GetServiceName() string {
 	return "codey"
 }

apis/vshn/v1/billing_service.go

@@ -0,0 +1,109 @@
+package v1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+	// BillingServiceFinalizer is the finalizer used to protect BillingService resources from deletion
+	BillingServiceFinalizer = "billing.appcat.vshn.io/delete-protection"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:object:generate=true
+// +kubebuilder:resource:scope=Namespaced,categories=appcat
+// +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
+// +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status"
+// +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp"
+
+// BillingService represents a service instance for billing purposes
+type BillingService struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Spec defines the desired state of a BillingService
+	Spec BillingServiceSpec `json:"spec"`
+
+	// Status reflects the observed state of a BillingService
+	Status BillingServiceStatus `json:"status,omitempty"`
+}
+
+// BillingServiceSpec defines the desired state of a BillingService
+type BillingServiceSpec struct {
+	// KeepAfterDeletion defines how many days to keep billing records after service deletion
+	KeepAfterDeletion int `json:"keepAfterDeletion,omitempty"`
+
+	// Odoo contains Odoo-specific billing configuration
+	Odoo OdooSpec `json:"odoo,omitempty"`
+}
+
+// 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"`
+
+	// 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"`
+}
+
+// BillingServiceStatus defines the observed state of a BillingService
+type BillingServiceStatus struct {
+	// Events contains the history of billing events
+	Events []BillingEventStatus `json:"events,omitempty"`
+
+	// Conditions represent the latest available observations of the billing service's state
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
+
+// 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 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"`
+
+	// Timestamp when the event occurred
+	Timestamp metav1.Time `json:"timestamp"`
+
+	// State represents the current state of the event (sent, pending, failed, superseded)
+	// +kubebuilder:validation:Enum="sent";"pending";"failed";"superseded"
+	State string `json:"state"`
+
+	// RetryCount tracks the number of retry attempts for failed events
+	// +kubebuilder:default=0
+	RetryCount int `json:"retryCount,omitempty"`
+
+	// LastAttemptTime is when we last tried to send this event
+	LastAttemptTime metav1.Time `json:"lastAttemptTime,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:object:generate=true
+
+// BillingServiceList contains a list of BillingService
+type BillingServiceList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []BillingService `json:"items"`
+}

apis/vshn/v1/dbaas_vshn_mariadb.go

@@ -145,6 +145,10 @@ type VSHNMariaDBStatus struct {
 	// CurrentInstances tracks the current amount of instances.
 	// Mainly used to detect if there was a change in instances
 	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"`
 	// ResourceStatus represents the observed state of a managed resource.
 	xpv1.ResourceStatus `json:",inline"`
 }

apis/vshn/v1/dbaas_vshn_postgresql.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
+	cpv1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
 	sgv1 "github.com/vshn/appcat/v4/apis/stackgres/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -36,7 +37,8 @@ type VSHNPostgreSQL struct {
 // VSHNPostgreSQLSpec defines the desired state of a VSHNPostgreSQL.
 type VSHNPostgreSQLSpec 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"`
 }
 

apis/vshn/v1/dbaas_vshn_redis.go

@@ -295,6 +295,7 @@ func (v *VSHNRedis) GetSize() VSHNSizeSpec {
 			Memory: v.Spec.Parameters.Size.MemoryRequests,
 		},
 		Disk: v.Spec.Parameters.Size.Disk,
+		Plan: v.Spec.Parameters.Size.Plan,
 	}
 }
 

apis/vshn/v1/groupversion_info.go

@@ -22,6 +22,9 @@ var (
 
 func init() {
 	SchemeBuilder.Register(
+		&BillingService{},
+		&BillingServiceList{},
+
 		&VSHNPostgreSQL{},
 		&VSHNPostgreSQLList{},
 		&XVSHNPostgreSQL{},

apis/vshn/v1/zz_generated.deepcopy.go

@@ -7,8 +7,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/vshn/appcat/v4/pkg"
+	"github.com/vshn/appcat/v4/pkg/controller/billing"
 	"github.com/vshn/appcat/v4/pkg/controller/events"
 	"github.com/vshn/appcat/v4/pkg/controller/webhooks"
+	"github.com/vshn/appcat/v4/pkg/odoo"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
@@ -26,6 +28,7 @@ type controller struct {
 	enableProviderWebhooks  bool
 	enableQuotas            bool
 	enableEventForwarding   bool
+	enableBilling           bool
 	certDir                 string
 }
 
@@ -51,6 +54,7 @@ func init() {
 	ControllerCMD.Flags().StringVar(&c.certDir, "certdir", "/etc/webhook/certs", "Set the webhook certificate directory")
 	ControllerCMD.Flags().BoolVar(&c.enableQuotas, "quotas", false, "Enable the quota webhooks, is only active if webhooks is also true")
 	ControllerCMD.Flags().BoolVar(&c.enableEventForwarding, "event-forwarding", true, "Disable event-forwarding")
+	ControllerCMD.Flags().BoolVar(&c.enableBilling, "billing", true, "Disable billing")
 	viper.AutomaticEnv()
 	if !viper.IsSet("PLANS_NAMESPACE") {
 		viper.Set("PLANS_NAMESPACE", "syn-appcat")
@@ -79,6 +83,30 @@ func (c *controller) executeController(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
+	if c.enableBilling {
+		opts := odoo.Options{
+			BaseURL:      viper.GetString("ODOO_BASE_URL"),
+			DB:           viper.GetString("ODOO_DB"),
+			ClientID:     viper.GetString("ODOO_CLIENT_ID"),
+			ClientSecret: viper.GetString("ODOO_CLIENT_SECRET"),
+			TokenURL:     viper.GetString("ODOO_TOKEN_URL"),
+		}
+
+		if opts.BaseURL == "" || opts.DB == "" || opts.ClientID == "" || opts.ClientSecret == "" || opts.TokenURL == "" {
+			return fmt.Errorf("billing is enabled but Odoo configuration is incomplete")
+		}
+
+		odooClient, err := odoo.NewClient(cmd.Context(), opts)
+		if err != nil {
+			return fmt.Errorf("initialize Odoo client: %w", err)
+		}
+
+		b := billing.New(mgr.GetClient(), mgr.GetScheme(), odooClient)
+		if err := b.SetupWithManager(mgr); err != nil {
+			return err
+		}
+	}
+
 	if c.enableEventForwarding {
 		events := &events.EventHandler{
 			Client: mgr.GetClient(),