Skip to content

Feat: Add PgPool Support on Postgres #1261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NotTabassum wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feat: Add PgPool Support on Postgres #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apis/installer/v1alpha1/ace_ace_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,15 @@ type Settings struct {
Firebase FirebaseSettings `json:"firebase"`
// +optional
Marketplace *MarketplaceSettings `json:"marketplace,omitempty"`
// +optional
PgPool *PgPoolSettings `json:"pgpool,omitempty"`
}

type PgPoolSettings struct {
Enabled bool `json:"enabled"`
Version string `json:"version"`
Replicas int `json:"replicas"`
Resources core.ResourceRequirements `json:"resources"`
}

type DBSettings struct {
Expand Down
21 changes: 21 additions & 0 deletions apis/installer/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions charts/ace/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@ The following table lists the configurable parameters of the `ace` chart and the
| settings.db.auth.username | | <code>postgres</code> |
| settings.db.auth.password | | <code>"xyz"</code> |
| settings.db.logSQL | | <code>false</code> |
| settings.pgpool.enabled | | <code>false</code> |
| settings.pgpool.version | | <code>"4.5.0"</code> |
| settings.pgpool.replicas | | <code>2</code> |
| settings.pgpool.resources.limits.memory | | <code>512Mi</code> |
| settings.pgpool.resources.requests.memory | | <code>256Mi</code> |
| settings.pgpool.resources.requests.cpu | | <code>250m</code> |
| settings.cache.version | | <code>"7.2.4"</code> |
| settings.cache.cacheInterval | | <code>60</code> |
| settings.cache.persistence.size | | <code>10Gi</code> |
Expand Down
4 changes: 4 additions & 0 deletions charts/ace/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,12 @@ Returns the ServiceMonitor labels
Determine database host name
*/}}
{{- define "settings.database.host" -}}
{{- if .Values.settings.pgpool.enabled -}}
{{- printf "%s-pgpool.%s.svc:5432" (include "ace.fullname" .) .Release.Namespace -}}
{{- else -}}
{{- printf "%s-db.%s.svc:5432" (include "ace.fullname" .) .Release.Namespace -}}
{{- end -}}
{{- end -}}

{{- define "settings.oauth2JWTSecret" -}}
{{ .Values.settings.security.oauth2JWTSecret | default (randAlphaNum 43) }}
Expand Down
67 changes: 67 additions & 0 deletions charts/ace/templates/db/pgpool.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{{- if .Values.settings.pgpool.enabled }}
apiVersion: kubedb.com/v1alpha2
kind: Pgpool
metadata:
name: {{ include "ace.fullname" . }}-pgpool
namespace: {{ .Release.Namespace }}
labels:
{{- include "ace.labels" . | nindent 4 }}
spec:
version: "{{ .Values.settings.pgpool.version }}"
replicas: {{ .Values.settings.pgpool.replicas }}
postgresRef:
name: {{ include "ace.fullname" . }}-db
namespace: {{ .Release.Namespace }}
syncUsers: true
deletionPolicy: {{ .Values.settings.db.deletionPolicy }}
podTemplate:
spec:
containers:
- name: pgpool
resources:
{{- toYaml .Values.settings.pgpool.resources | nindent 10 }}
{{- if eq (include "distro.openshift" $) "true" }}
securityContext:
runAsGroup: {{ .Values.securityContext.runAsUser }}
runAsUser: {{ .Values.securityContext.runAsUser }}
capabilities:
drop:
- ALL
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
securityContext:
fsGroup: {{ .Values.securityContext.runAsUser }}
runAsUser: {{ .Values.securityContext.runAsUser }}
runAsGroup: {{ .Values.securityContext.runAsUser }}
{{- end }}
{{- if .Values.global.monitoring }}
monitor:
agent: {{ .Values.global.monitoring.agent }}
prometheus:
serviceMonitor:
interval: 30s
labels:
{{- toYaml .Values.global.monitoring.serviceMonitor.labels | nindent 10 }}
{{- end }}
---
apiVersion: appcatalog.appscode.com/v1alpha1
kind: AppBinding
metadata:
name: {{ include "ace.fullname" . }}-pgpool
namespace: {{ .Release.Namespace }}
labels:
{{- include "ace.labels" . | nindent 4 }}
spec:
type: kubedb.com/pgpool
appRef:
apiGroup: kubedb.com
kind: Pgpool
name: {{ include "ace.fullname" . }}-pgpool
namespace: {{ .Release.Namespace }}
clientConfig:
service:
name: {{ include "ace.fullname" . }}-pgpool
scheme: postgresql
port: 5432
{{- end }}
47 changes: 47 additions & 0 deletions charts/ace/values.openapiv3_schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24481,6 +24481,53 @@ properties:
- apiURL
- preSharedKey
type: object
pgpool:
properties:
enabled:
type: boolean
replicas:
type: integer
resources:
properties:
claims:
items:
properties:
name:
type: string
request:
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
type: object
version:
type: string
required:
- enabled
- replicas
- resources
- version
type: object
platform:
properties:
appName:
Expand Down
10 changes: 10 additions & 0 deletions charts/ace/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,16 @@ settings:
username: postgres
password: "xyz"
logSQL: false
pgpool:
enabled: false
version: "4.5.0"
replicas: 2
resources:
limits:
memory: 512Mi
requests:
memory: 256Mi
cpu: 250m
cache:
version: "7.2.4"
cacheInterval: 60
Expand Down
Loading