Skip to content

[pgadmin4/pgadmin4-helm] Typo indentation fix for extraEnvVars field, serverDefinitions preserved tpl. README.md typo fix, increased resources #9255

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

Merged
khushboovashi merged 5 commits into from
Oct 31, 2025
Merged

[pgadmin4/pgadmin4-helm] Typo indentation fix for extraEnvVars field, serverDefinitions preserved tpl. README.md typo fix, increased resources #9255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e638c0
Update deployment.yaml
KorenP1 Oct 15, 2025
4699c82
Preserve tpl for serversDefinitions
Oct 15, 2025
54602ea
Update README.md
KorenP1 Oct 24, 2025
767dce4
Update README for PgAdmin4 K8S Helm Chart
KorenP1 Oct 24, 2025
95ee112
Update values.yaml
KorenP1 Oct 26, 2025
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
4 changes: 2 additions & 2 deletions pkg/helm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ The chart should dump its version and appVersion in the Chart.yaml file every re
| `preferences.enabled` | Whether to mount preferences.json | `false` |
| `preferences.data` | Preferences to load | `{}` |
| `resources.*` | Allocated requests and limits resources | `{"requests": {...}, "limits": {...}}` |
| `persistence.enabled` | PVC resource creation | `false` |
| `persistence.enabled` | PVC resource creation | `true` |
| `service.type` | Service type | `"ClusterIP"` |
| `service.loadBalancerIP` | Load balancer IP (Only if service.type is LoadBalancer) | `""` |
| `ingress.enabled` | Ingress resource creation | `false` |
| `ingress.hostname` | Ingress resource hostname | `"pgadmin4.local"` |
| `ingress.hostname` | Ingress resource hostname | `"pgadmin4.local"` |
23 changes: 22 additions & 1 deletion pkg/helm/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,25 @@
{{- $securityContext = omit $securityContext "appArmorProfile" -}}
{{- end -}}
{{- $securityContext | toYaml -}}
{{- end -}}
{{- end -}}

{{- define "tpl.preserve.variable" -}}
{{- $obj := . }}
{{- if kindIs "map" $obj }}
{{- range $k, $v := $obj }}
{{- if kindIs "string" $v }}
{{- if regexMatch "^[0-9]+$" $v }}
{{- $_ := set $obj $k (atoi $v) }}
{{- else if regexMatch "(?i)^(true|false)$" $v }}
{{- $_ := set $obj $k (eq (lower $v) "true") }}
{{- end }}
{{- else }}
{{- include "tpl.preserve.variable" $v }}
{{- end }}
{{- end }}
{{- else if kindIs "slice" $obj }}
{{- range $i, $v := $obj }}
{{- include "tpl.preserve.variable" $v }}
{{- end }}
{{- end }}
{{- end }}
4 changes: 3 additions & 1 deletion pkg/helm/templates/configmap-serverDefinitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ metadata:
annotations: {{ . | toYaml | nindent 4 }}
{{- end }}
data:
servers.json: | {{ tpl (dict "Servers" .Values.serverDefinitions.data | toYaml) . | fromYaml | toPrettyJson | nindent 4 }}
{{- $variableToPreserveTPL := tpl (dict "Servers" .Values.serverDefinitions.data | toYaml) . | fromYaml }}
{{- include "tpl.preserve.variable" $variableToPreserveTPL }}
servers.json: | {{ $variableToPreserveTPL | toYaml | nindent 4 }}
{{- end }}
4 changes: 2 additions & 2 deletions pkg/helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
- name: PGADMIN_DISABLE_POSTFIX
value: {{ .Values.disablePostfix | quote }}
{{- with .Values.extraEnvVars }}
{{- tpl (. | toYaml) $ | nindent 14 }}
{{- tpl (. | toYaml) $ | nindent 12 }}
{{- end }}
volumeMounts:
- mountPath: /var/lib/pgadmin
Expand Down Expand Up @@ -234,4 +234,4 @@ spec:
type: RuntimeDefault
{{- end }}
windowsOptions:
hostProcess: false
hostProcess: false
11 changes: 6 additions & 5 deletions pkg/helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ preferences:

resources:
requests:
cpu: 250m
memory: 512Mi
cpu: 500m
memory: 1Gi
limits:
cpu: 250m
memory: 512Mi
cpu: 500m
memory: 1Gi

persistence:
enabled: true
Expand Down Expand Up @@ -152,4 +152,5 @@ containerSecurityContext:
appArmorProfile:
type: RuntimeDefault
windowsOptions:
hostProcess: false

hostProcess: false
Loading