Merge pull request #559 from vshn/develop

🔀 Merge develop into master (Release)

Author: vshnbot

apis/vshn/v1/dbaas_vshn_forgejo.go

@@ -70,6 +70,10 @@ type VSHNForgejoParameters struct {
 	// Monitoring contains settings to control the monitoring of a service.
 	Monitoring VSHNMonitoring `json:"monitoring,omitempty"`
 
+	// +kubebuilder:default=1
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:validation:Maximum=1
+
 	// Instances defines the number of instances to run.
 	Instances int `json:"instances,omitempty"`
 }

apis/vshn/v1/dbaas_vshn_keycloak.go

@@ -87,7 +87,7 @@ type VSHNKeycloakParameters struct {
 	Security Security `json:"security,omitempty"`
 
 	// +kubebuilder:default=1
-	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Minimum=0
 	// +kubebuilder:validation:Maximum=3
 
 	// Instances configures the number of Keycloak instances for the cluster.
@@ -255,6 +255,10 @@ func (v *XVSHNKeycloak) GetCompositionName() string {
 	return v.Spec.CompositionRef.Name
 }
 
+func (v *XVSHNKeycloak) GetInstances() int {
+	return v.Spec.Parameters.Instances
+}
+
 func (v *VSHNKeycloak) SetInstanceNamespaceStatus() {
 	v.Status.InstanceNamespace = v.GetInstanceNamespace()
 }

apis/vshn/v1/dbaas_vshn_mariadb.go

@@ -86,7 +86,8 @@ type VSHNMariaDBParameters struct {
 	Security Security `json:"security,omitempty"`
 
 	// +kubebuilder:default=1
-	// +kubebuilder:validation:Enum=1;3;
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:validation:Enum=0;1;3;
 
 	// Instances configures the number of MariaDB instances for the cluster.
 	// Each instance contains one MariaDB server.
@@ -207,6 +208,10 @@ func (v *XVSHNMariaDB) GetCompositionName() string {
 	return v.Spec.CompositionRef.Name
 }
 
+func (v *XVSHNMariaDB) GetInstances() int {
+	return v.Spec.Parameters.Instances
+}
+
 // XVSHNMariaDBSpec defines the desired state of a VSHNMariaDB.
 type XVSHNMariaDBSpec struct {
 	// Parameters are the configurable fields of a VSHNMariaDB.

apis/vshn/v1/dbaas_vshn_postgresql.go

@@ -75,7 +75,7 @@ type VSHNPostgreSQLParameters struct {
 	UpdateStrategy VSHNPostgreSQLUpdateStrategy `json:"updateStrategy,omitempty"`
 
 	// +kubebuilder:default=1
-	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Minimum=0
 	// +kubebuilder:validation:Maximum=3
 
 	// Instances configures the number of PostgreSQL instances for the cluster.
@@ -435,6 +435,10 @@ func (v *XVSHNPostgreSQL) GetCompositionName() string {
 	return v.Spec.CompositionRef.Name
 }
 
+func (v *XVSHNPostgreSQL) GetInstances() int {
+	return v.Spec.Parameters.Instances
+}
+
 // GetBackupRetention returns the retention definition for this backup.
 func (v *VSHNPostgreSQL) GetBackupRetention() K8upRetentionPolicy {
 	return K8upRetentionPolicy{}

apis/vshn/v1/dbaas_vshn_redis.go

@@ -80,7 +80,7 @@ type VSHNRedisParameters struct {
 	Security Security `json:"security,omitempty"`
 
 	// +kubebuilder:default=1
-	// +kubebuilder:validation:Enum=1;3;
+	// +kubebuilder:validation:Enum=0;1;3;
 
 	// Instances configures the number of Redis instances for the cluster.
 	Instances int `json:"instances,omitempty"`
@@ -188,6 +188,10 @@ func (v *XVSHNRedis) GetCompositionName() string {
 	return v.Spec.CompositionRef.Name
 }
 
+func (v *XVSHNRedis) GetInstances() int {
+	return v.Spec.Parameters.Instances
+}
+
 // XVSHNRedisSpec defines the desired state of a VSHNRedis.
 type XVSHNRedisSpec struct {
 	// Parameters are the configurable fields of a VSHNRedis.

apis/vshn/v1/vshn_minio.go

@@ -161,6 +161,10 @@ func (v *XVSHNMinio) GetCompositionName() string {
 	return v.Spec.CompositionRef.Name
 }
 
+func (v *XVSHNMinio) GetInstances() int {
+	return v.Spec.Parameters.Instances
+}
+
 // XVSHNMinioSpec defines the desired state of a VSHNMinio.
 type XVSHNMinioSpec struct {
 	// Parameters are the configurable fields of a VSHNMinio.

apis/vshn/v1/vshn_nextcloud.go

@@ -93,7 +93,7 @@ type VSHNNextcloudParameters struct {
 	Security Security `json:"security,omitempty"`
 
 	// +kubebuilder:default=1
-	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Minimum=0
 	// +kubebuilder:validation:Maximum=3
 
 	// Instances configures the number of Nextcloud instances for the cluster.

crds/vshn.appcat.vshn.io_vshnforgejoes.yaml

@@ -74,7 +74,10 @@ spec:
                       type: object
                       default: {}
                     instances:
+                      default: 1
                       description: Instances defines the number of instances to run.
+                      maximum: 1
+                      minimum: 0
                       type: integer
                     maintenance:
                       description: Maintenance contains settings to control the maintenance of an instance.

crds/vshn.appcat.vshn.io_vshnkeycloaks.yaml

@@ -80,7 +80,7 @@ spec:
                         Instances configures the number of Keycloak instances for the cluster.
                         Each instance contains one Keycloak server.
                       maximum: 3
-                      minimum: 1
+                      minimum: 0
                       type: integer
                     maintenance:
                       description: Maintenance contains settings to control the maintenance of an instance.
@@ -4792,7 +4792,7 @@ spec:
                                 Each instance contains one Postgres server.
                                 Out of all Postgres servers, one is elected as the primary, the rest remain as read-only replicas.
                               maximum: 3
-                              minimum: 1
+                              minimum: 0
                               type: integer
                             maintenance:
                               description: Maintenance contains settings to control the maintenance of an instance.

crds/vshn.appcat.vshn.io_vshnmariadbs.yaml

@@ -83,8 +83,10 @@ spec:
                         An additional ProxySQL statefulset will be deployed to make failovers
                         as seamless as possible.
                       enum:
+                        - 0
                         - 1
                         - 3
+                      minimum: 0
                       type: integer
                     maintenance:
                       description: Maintenance contains settings to control the maintenance of an instance.