feat: expose core db connection settings (#1056)

Allow to change core.spec.database.maxIdleConnections and core.spec.database.maxOpenConnections in harborcluster. Signed-off-by: Eric Liu <shuaiyi@google.com> Co-authored-by: Eric Liu <shuaiyi@google.com>
goharbor · Aug 8, 2023 · 4f460cb · 4f460cb
1 parent f06cd9e
commit 4f460cb
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 0 deletions.
diff --git a/apis/goharbor.io/v1beta1/harbor_types.go b/apis/goharbor.io/v1beta1/harbor_types.go
@@ -374,6 +374,16 @@ type CoreComponentSpec struct {
 
 	// +kubebuilder:validation:Optional
 	Metrics *harbormetav1.MetricsSpec `json:"metrics,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:default=50
+	MaxIdleConnections *int32 `json:"maxIdleConnections,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:default=1000
+	MaxOpenConnections *int32 `json:"maxOpenConnections,omitempty"`
 }
 
 type JobServiceComponentSpec struct {

diff --git a/apis/goharbor.io/v1beta1/zz_generated.deepcopy.go b/apis/goharbor.io/v1beta1/zz_generated.deepcopy.go
diff --git a/controllers/goharbor/harbor/core.go b/controllers/goharbor/harbor/core.go
@@ -454,6 +454,8 @@ func (r *Reconciler) GetCore(ctx context.Context, harbor *goharborv1.Harbor) (*g
 			CSRFKeyRef: csrfRef,
 			Database: goharborv1.CoreDatabaseSpec{
 				PostgresConnectionWithParameters: *storage,
+				MaxIdleConnections:               harbor.Spec.Core.MaxIdleConnections,
+				MaxOpenConnections:               harbor.Spec.Core.MaxOpenConnections,
 				EncryptionKeyRef:                 encryptionKeyRef,
 			},
 			ExternalEndpoint: harbor.Spec.ExternalURL,

diff --git a/controllers/goharbor/harbor_test.go b/controllers/goharbor/harbor_test.go
@@ -138,6 +138,10 @@ func setupValidHarbor(ctx context.Context, ns string) (Resource, client.ObjectKe
 		Host:   "the.dns",
 	}
 
+	var maxIdleConnections int32 = 50
+
+	var maxOpenConnections int32 = 100
+
 	harbor := &goharborv1.Harbor{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -168,6 +172,8 @@ func setupValidHarbor(ctx context.Context, ns string) (Resource, client.ObjectKe
 					TokenIssuer: cmmeta.ObjectReference{
 						Name: tokenIssuerName,
 					},
+					MaxIdleConnections: &maxIdleConnections,
+					MaxOpenConnections: &maxOpenConnections,
 				},
 				Database: &goharborv1.HarborDatabaseSpec{
 					PostgresCredentials: database.PostgresCredentials,

diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
@@ -10025,6 +10025,16 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     type: array
+                  maxIdleConnections:
+                    default: 50
+                    format: int32
+                    minimum: 0
+                    type: integer
+                  maxOpenConnections:
+                    default: 1000
+                    format: int32
+                    minimum: 0
+                    type: integer
                   metrics:
                     properties:
                       enabled:
@@ -15986,6 +15996,16 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     type: array
+                  maxIdleConnections:
+                    default: 50
+                    format: int32
+                    minimum: 0
+                    type: integer
+                  maxOpenConnections:
+                    default: 1000
+                    format: int32
+                    minimum: 0
+                    type: integer
                   metrics:
                     properties:
                       enabled:

diff --git a/manifests/harbor/deployment.yaml b/manifests/harbor/deployment.yaml
@@ -10025,6 +10025,16 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     type: array
+                  maxIdleConnections:
+                    default: 50
+                    format: int32
+                    minimum: 0
+                    type: integer
+                  maxOpenConnections:
+                    default: 1000
+                    format: int32
+                    minimum: 0
+                    type: integer
                   metrics:
                     properties:
                       enabled:
@@ -15986,6 +15996,16 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     type: array
+                  maxIdleConnections:
+                    default: 50
+                    format: int32
+                    minimum: 0
+                    type: integer
+                  maxOpenConnections:
+                    default: 1000
+                    format: int32
+                    minimum: 0
+                    type: integer
                   metrics:
                     properties:
                       enabled: