Merge pull request #541 from vshn/develop

🔀 Merge develop into master (Release)

Author: vshnbot

README.md

@@ -171,14 +171,18 @@ Creating a PostgreSQL or Redis instance will now go through the Webhook instance
 ## SLI Exporter
 ### Metrics
 
-The exporter exposes a histogram `appcat_probes_seconds` with five labels
+The exporter exposes a histogram `appcat_probes_seconds` with the following labels:
 
 * `service`, the service type that was probed (e.g. `VSHNPostgreSQL`)
-* `namespace`, the namespace of the claim that was monitored
+* `claim_namespace`, the namespace of the claim that was monitored
+* `instance_namespace`, the namespace where the instance is deployed
 * `name`, the name of the claim that was monitored
-* `sla`, the service level. Can either be `besteffort` or `guaranteed`
-* `high_available`, whether this instance is high available (1 or more nodes)
 * `reason`, if the probe was successful. Can either be `success`, `fail-timeout`, or `fail-unkown`
+* `organization`, the organization label from the namespace
+* `ha`, whether this instance is high available (true or false)
+* `sla`, the service level. Can either be `besteffort` or `guaranteed`
+* `maintenance`, whether maintenance is currently running (true or false)
+* `composition`, the name of the composition being used (e.g. `vshnpostgrescnpg.vshn.appcat.vshn.io`)
 
 #### Adding a Prober
 

apis/vshn/v1/dbaas_vshn_keycloak.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
+	cpv1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -250,6 +251,10 @@ func (v *XVSHNKeycloak) GetInstanceNamespace() string {
 	return fmt.Sprintf("vshn-keycloak-%s", v.GetName())
 }
 
+func (v *XVSHNKeycloak) GetCompositionName() string {
+	return v.Spec.CompositionRef.Name
+}
+
 func (v *VSHNKeycloak) SetInstanceNamespaceStatus() {
 	v.Status.InstanceNamespace = v.GetInstanceNamespace()
 }
@@ -301,10 +306,9 @@ type XVSHNKeycloak struct {
 // XVSHNKeycloakSpec defines the desired state of a VSHNKeycloak.
 type XVSHNKeycloakSpec struct {
 	// Parameters are the configurable fields of a VSHNKeycloak.
-	Parameters VSHNKeycloakParameters `json:"parameters,omitempty"`
-
-	ResourceRefs []xpv1.TypedReference `json:"resourceRefs,omitempty"`
-
+	Parameters        VSHNKeycloakParameters    `json:"parameters,omitempty"`
+	CompositionRef    cpv1.CompositionReference `json:"compositionRef,omitempty"`
+	ResourceRefs      []xpv1.TypedReference     `json:"resourceRefs,omitempty"`
 	xpv1.ResourceSpec `json:",inline"`
 }
 

apis/vshn/v1/dbaas_vshn_mariadb.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
+	cpv1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -202,11 +203,15 @@ func (v *XVSHNMariaDB) GetInstanceNamespace() string {
 	return fmt.Sprintf("vshn-mariadb-%s", v.GetName())
 }
 
+func (v *XVSHNMariaDB) GetCompositionName() string {
+	return v.Spec.CompositionRef.Name
+}
+
 // XVSHNMariaDBSpec defines the desired state of a VSHNMariaDB.
 type XVSHNMariaDBSpec struct {
 	// Parameters are the configurable fields of a VSHNMariaDB.
-	Parameters VSHNMariaDBParameters `json:"parameters,omitempty"`
-
+	Parameters        VSHNMariaDBParameters     `json:"parameters,omitempty"`
+	CompositionRef    cpv1.CompositionReference `json:"compositionRef,omitempty"`
 	xpv1.ResourceSpec `json:",inline"`
 }
 

apis/vshn/v1/dbaas_vshn_postgresql.go

@@ -431,6 +431,10 @@ func (v *XVSHNPostgreSQL) GetInstanceNamespace() string {
 	return fmt.Sprintf("vshn-postgresql-%s", v.GetName())
 }
 
+func (v *XVSHNPostgreSQL) GetCompositionName() string {
+	return v.Spec.CompositionRef.Name
+}
+
 // GetBackupRetention returns the retention definition for this backup.
 func (v *VSHNPostgreSQL) GetBackupRetention() K8upRetentionPolicy {
 	return K8upRetentionPolicy{}

apis/vshn/v1/dbaas_vshn_redis.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
+	cpv1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -183,11 +184,15 @@ func (v *XVSHNRedis) GetInstanceNamespace() string {
 	return fmt.Sprintf("vshn-redis-%s", v.GetName())
 }
 
+func (v *XVSHNRedis) GetCompositionName() string {
+	return v.Spec.CompositionRef.Name
+}
+
 // XVSHNRedisSpec defines the desired state of a VSHNRedis.
 type XVSHNRedisSpec struct {
 	// Parameters are the configurable fields of a VSHNRedis.
-	Parameters VSHNRedisParameters `json:"parameters,omitempty"`
-
+	Parameters        VSHNRedisParameters       `json:"parameters,omitempty"`
+	CompositionRef    cpv1.CompositionReference `json:"compositionRef,omitempty"`
 	xpv1.ResourceSpec `json:",inline"`
 }
 

apis/vshn/v1/vshn_minio.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
+	cpv1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -156,11 +157,15 @@ func (v *XVSHNMinio) GetInstanceNamespace() string {
 	return fmt.Sprintf("vshn-minio-%s", v.GetName())
 }
 
+func (v *XVSHNMinio) GetCompositionName() string {
+	return v.Spec.CompositionRef.Name
+}
+
 // XVSHNMinioSpec defines the desired state of a VSHNMinio.
 type XVSHNMinioSpec struct {
 	// Parameters are the configurable fields of a VSHNMinio.
-	Parameters VSHNMinioParameters `json:"parameters,omitempty"`
-
+	Parameters        VSHNMinioParameters       `json:"parameters,omitempty"`
+	CompositionRef    cpv1.CompositionReference `json:"compositionRef,omitempty"`
 	xpv1.ResourceSpec `json:",inline"`
 }
 

apis/vshn/v1/vshn_nextcloud.go

@@ -117,10 +117,13 @@ type VSHNNextcloudServiceSpec struct {
 	// +kubebuilder:default="/"
 	RelativePath string `json:"relativePath,omitempty"`
 
+	// +kubebuilder:validation:Pattern=`^[0-9]+(\.[0-9]+)?$`
 	// +kubebuilder:default="31"
 
 	// Version contains supported version of nextcloud.
 	// Multiple versions are supported. The latest version 31 is the default version.
+	// Only major (e.g., "31") or major.minor (e.g., "31.0") versions are allowed.
+	// Patch versions (e.g., "31.0.4") are not allowed as they break maintenance.
 	Version string `json:"version,omitempty"`
 
 	// +kubebuilder:validation:Enum="besteffort";"guaranteed"
@@ -228,7 +231,10 @@ type CollaboraSpec struct {
 	Enabled bool `json:"enabled"`
 	// FQDN contains the FQDN of the Collabora server. This is used to configure the Collabora server URL in Your Nextcloud instance.
 	FQDN string `json:"fqdn,omitempty"`
+	// +kubebuilder:validation:Pattern=`^[0-9]+(\.[0-9]+)?$`
 	// Version defines the Collabora version to use.
+	// Only major (e.g., "24") or major.minor (e.g., "24.04") versions are allowed.
+	// Patch versions (e.g., "24.04.3") are not allowed as they break maintenance.
 	Version string `json:"version,omitempty"`
 }
 

apis/vshn/v1/zz_generated.deepcopy.go

@@ -4627,7 +4627,11 @@ spec:
                               description: FQDN contains the FQDN of the Collabora server. This is used to configure the Collabora server URL in Your Nextcloud instance.
                               type: string
                             version:
-                              description: Version defines the Collabora version to use.
+                              description: |-
+                                Version defines the Collabora version to use.
+                                Only major (e.g., "24") or major.minor (e.g., "24.04") versions are allowed.
+                                Patch versions (e.g., "24.04.3") are not allowed as they break maintenance.
+                              pattern: ^[0-9]+(\.[0-9]+)?$
                               type: string
                           required:
                             - enabled
@@ -9492,6 +9496,9 @@ spec:
                           description: |-
                             Version contains supported version of nextcloud.
                             Multiple versions are supported. The latest version 31 is the default version.
+                            Only major (e.g., "31") or major.minor (e.g., "31.0") versions are allowed.
+                            Patch versions (e.g., "31.0.4") are not allowed as they break maintenance.
+                          pattern: ^[0-9]+(\.[0-9]+)?$
                           type: string
                       required:
                         - fqdn

crds/vshn.appcat.vshn.io_vshnnextclouds.yaml

@@ -39,6 +39,15 @@ spec:
           spec:
             description: XVSHNKeycloakSpec defines the desired state of a VSHNKeycloak.
             properties:
+              compositionRef:
+                description: A CompositionReference references a Composition.
+                properties:
+                  name:
+                    description: Name of the Composition.
+                    type: string
+                required:
+                - name
+                type: object
               deletionPolicy:
                 default: Delete
                 description: |-