Merge pull request #527 from vshn/develop

🔀 Merge develop into master (Release)

Author: vshnbot

.github/workflows/merge.yml

@@ -189,7 +189,7 @@ jobs:
           if git diff --cached --quiet; then
             echo "✅ No changes to commit"
           else
-            git commit -m "Auto update from appcat PR #${{ needs.check-conditions.outputs.pr-number }}, dependency $APPCAT_FR_COMMIT_SHA"
+            git commit -m "Auto update from appcat PR https://github.com/${{ env.APPCAT_REPO }}/pull/${{ needs.check-conditions.outputs.pr-number }}, dependency $APPCAT_FR_COMMIT_SHA"
             git push origin "$COMPONENT_BRANCH"
           fi
 
@@ -301,7 +301,7 @@ jobs:
           if git diff --cached --quiet; then
             echo "✅ No changes to commit"
           else
-            git commit -m "Auto update from appcat PR #${{ needs.check-conditions.outputs.pr-number }}, dependency $APPCAT_NEW_TAG"
+            git commit -m "Auto update from appcat PR https://github.com/${{ env.APPCAT_REPO }}/pull/${{ needs.check-conditions.outputs.pr-number }}, dependency $APPCAT_NEW_TAG"
             git push origin "$COMPONENT_BRANCH"
           fi
 

apis/stackgres/v1/sgcluster.gen.go

@@ -12,7 +12,7 @@ const (
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:object:generate=true
-// +kubebuilder:resource:scope=Namespaced,categories=appcat
+// +kubebuilder:resource:scope=Namespaced,categories=appcatbilling
 // +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"

apis/stackgres/v1/zz_generated.deepcopy.go

@@ -156,6 +156,17 @@ type VSHNPostgreSQLServiceSpec struct {
 	// +kubebuilder:default=false
 	DisablePgBouncer bool `json:"disablePgBouncer,omitempty"`
 
+	// Set to true to reserve the specified CPU and memory exclusively for Patroni,
+	// with sidecar containers getting separate allocations.
+	// Leave as false (default) to let StackGres automatically distribute the
+	// specified resources across all containers.
+	// +kubebuilder:default=false
+	DedicatedPatroniResources bool `json:"dedicatedPatroniResources,omitempty"`
+
+	// Enable envoy sidecar proxy
+	// +kubebuilder:default=false
+	EnableEnvoy bool `json:"enableEnvoy,omitempty"`
+
 	// +kubebuilder:default=true
 	// This is default option if neither repack or vacuum are selected
 	RepackEnabled bool `json:"repackEnabled,omitempty"`

apis/vshn/v1/billing_service.go

@@ -227,7 +227,6 @@ type CollaboraSpec struct {
 	//+kubebuilder:default=false
 	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.
-	//+kubebuilder:validation:Required
 	FQDN string `json:"fqdn,omitempty"`
 	// Version defines the Collabora version to use.
 	Version string `json:"version,omitempty"`

apis/vshn/v1/dbaas_vshn_postgresql.go

@@ -9,7 +9,7 @@ spec:
   group: vshn.appcat.vshn.io
   names:
     categories:
-    - appcat
+    - appcatbilling
     kind: BillingService
     listKind: BillingServiceList
     plural: billingservices

apis/vshn/v1/vshn_nextcloud.go

@@ -9423,10 +9423,22 @@ spec:
                                       - user
                                     type: object
                                   type: array
+                                dedicatedPatroniResources:
+                                  default: false
+                                  description: |-
+                                    Set to true to reserve the specified CPU and memory exclusively for Patroni,
+                                    with sidecar containers getting separate allocations.
+                                    Leave as false (default) to let StackGres automatically distribute the
+                                    specified resources across all containers.
+                                  type: boolean
                                 disablePgBouncer:
                                   default: false
                                   description: Disable connection pooling service PgBouncer. All connections will go straight to PostgreSQL instance.
                                   type: boolean
+                                enableEnvoy:
+                                  default: false
+                                  description: Enable envoy sidecar proxy
+                                  type: boolean
                                 extensions:
                                   description: Extensions allow to enable/disable any of the supported
                                   items:

crds/vshn.appcat.vshn.io_billingservices.yaml

@@ -4631,7 +4631,6 @@ spec:
                               type: string
                           required:
                             - enabled
-                            - fqdn
                           type: object
                         existingPGConnectionSecret:
                           description: |-
@@ -9330,10 +9329,22 @@ spec:
                                       - user
                                     type: object
                                   type: array
+                                dedicatedPatroniResources:
+                                  default: false
+                                  description: |-
+                                    Set to true to reserve the specified CPU and memory exclusively for Patroni,
+                                    with sidecar containers getting separate allocations.
+                                    Leave as false (default) to let StackGres automatically distribute the
+                                    specified resources across all containers.
+                                  type: boolean
                                 disablePgBouncer:
                                   default: false
                                   description: Disable connection pooling service PgBouncer. All connections will go straight to PostgreSQL instance.
                                   type: boolean
+                                enableEnvoy:
+                                  default: false
+                                  description: Enable envoy sidecar proxy
+                                  type: boolean
                                 extensions:
                                   description: Extensions allow to enable/disable any of the supported
                                   items:

crds/vshn.appcat.vshn.io_vshnkeycloaks.yaml

@@ -4771,10 +4771,22 @@ spec:
                               - user
                             type: object
                           type: array
+                        dedicatedPatroniResources:
+                          default: false
+                          description: |-
+                            Set to true to reserve the specified CPU and memory exclusively for Patroni,
+                            with sidecar containers getting separate allocations.
+                            Leave as false (default) to let StackGres automatically distribute the
+                            specified resources across all containers.
+                          type: boolean
                         disablePgBouncer:
                           default: false
                           description: Disable connection pooling service PgBouncer. All connections will go straight to PostgreSQL instance.
                           type: boolean
+                        enableEnvoy:
+                          default: false
+                          description: Enable envoy sidecar proxy
+                          type: boolean
                         extensions:
                           description: Extensions allow to enable/disable any of the supported
                           items: