Skip to content

Commit a2d90fc

Browse files
ScribblerCoderScribblerCoder
committed
fix(chart): set bitnami's postgresql-ha images to bitnamilegacy registry
1 parent bdf9284 commit a2d90fc

4 files changed

Lines changed: 73 additions & 32 deletions

File tree

‎gzctf/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: gzctf
33
description: A Helm chart for deploying GZCTF on Kubernetes
44
type: application
5-
version: 0.1.4
5+
version: 0.1.5
66

77
dependencies:
88
- name: garnet

‎gzctf/README.md‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# GZCTF Helm Chart
2-
![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
2+
![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
33
[![Lint and Server-side Dryrun Chart](https://github.com/GZCTF/helm/actions/workflows/lint-and-test-chart.yaml/badge.svg)](https://github.com/GZCTF/helm/actions/workflows/lint-and-test-chart.yaml)
44

55
This is a Helm chart for deploying GZCTF on Kubernetes. It deploys the official [GZCTF Docker image](https://ghcr.io/gztimewalker/gzctf/gzctf). Optional HA/Autoscaling (still experimental) + postgresql or postgresql-ha + [Garnet](https://github.com/microsoft/Garnet) or [redis-ha](https://github.com/DandyDeveloper/charts/tree/master/charts/redis-ha) + [MinIO S3](https://github.com/minio/minio/tree/master/helm/minio). Also supports using external Postgresql/Redis/S3.
@@ -42,9 +42,12 @@ helm install release-name . -f values.yaml --create-namespace --namespace gzctf
4242
helm uninstall release-name --namespace gzctf
4343
```
4444

45-
## Info
46-
- multi-node is still experimental (needs extensive testing)
47-
- postgresql-ha bitnami image is legacy/deprecated
45+
## Important Notes
46+
- multi-node deployment is still experimental (needs extensive testing)
47+
- gzctf support for s3 bucket is experimental (single-node deployment doesnt need s3 bucket)
48+
- garnet/redis is not needed for single-node deployment
49+
- minio stopped releasing community edition binaries and docker images [minio/minio/issues/21647](https://github.com/minio/minio/issues/21647)
50+
- postgresql-ha bitnami image is [legacy/deprecated](https://github.com/bitnami/containers/issues/83267)
4851

4952
## Values examples
5053

@@ -141,7 +144,7 @@ minio:
141144
142145
| Key | Type | Default | Description |
143146
|-----|------|---------|-------------|
144-
| extraObjects | list | [] | Additional Kubernetes manifests to deploy with this Helm chart |
147+
| extraObjects | list | `[]` | Additional Kubernetes manifests to deploy with this Helm chart |
145148
| garnet.config.existingSecret | string | `""` | Garnet secret (if you want to use an existing secret). This secret must contains a key called 'garnet.conf'. |
146149
| garnet.config.garnetConf | string | `"{\n \"AuthenticationMode\": \"Password\",\n \"Password\": \"gzctf\"\n}\n"` | The garnet.conf data content. |
147150
| garnet.enabled | bool | `false` | Enable Microsoft Garnet cache-store deployment |
@@ -224,17 +227,27 @@ minio:
224227
| minio.rootPassword | string | `"gzctf"` | MinIO password |
225228
| minio.rootUser | string | `"gzctf"` | MinIO user |
226229
| postgresql-ha.enabled | bool | `false` | Enable or disable PostgreSQL HA deployment (THIS USES BITNAMI LEGACY IMAGES BY DEFAULT WHICH NO LONGER RECIEVE RPOPER SECURITY UPDATES) |
227-
| postgresql-ha.image.registry | string | `"docker.io"` | Docker registry for PostgreSQL image |
228-
| postgresql-ha.image.repository | string | `"bitnamilegacy/postgresql-repmgr"` | PostgreSQL repository (legacy repmgr version) |
229-
| postgresql-ha.image.tag | string | `"17.6.0-debian-12-r2"` | PostgreSQL image tag (version 17.6.0) |
230+
| postgresql-ha.metrics.enabled | bool | `false` | postgresql exporter enable |
231+
| postgresql-ha.metrics.image.registry | string | `"docker.io"` | postgres-exporter image registry |
232+
| postgresql-ha.metrics.image.repository | string | `"bitnamilegacy/postgres-exporter"` | postgres-exporter image repository |
233+
| postgresql-ha.metrics.image.tag | string | `"0.17.1-debian-12-r16"` | postgres-exporter image tag |
230234
| postgresql-ha.persistence.accessMode | string | `"ReadWriteOnce"` | Volume access mode |
231235
| postgresql-ha.persistence.enabled | bool | `true` | Enable persistent volume for database storage |
232236
| postgresql-ha.persistence.size | string | `"2Gi"` | Persistent volume size |
233237
| postgresql-ha.persistence.storageClass | string | `""` | Storage class name (empty string uses cluster default) |
238+
| postgresql-ha.pgpool.image.registry | string | `"docker.io"` | pgpool image registry |
239+
| postgresql-ha.pgpool.image.repository | string | `"bitnamilegacy/pgpool"` | pgpool image repository |
240+
| postgresql-ha.pgpool.image.tag | string | `"4.6.3-debian-12-r0"` | pgpool image tag |
234241
| postgresql-ha.postgresql.database | string | `"gzctf"` | Default database name to create |
242+
| postgresql-ha.postgresql.image.registry | string | `"docker.io"` | Docker registry for PostgreSQL image |
243+
| postgresql-ha.postgresql.image.repository | string | `"bitnamilegacy/postgresql-repmgr"` | PostgreSQL repository (bitnamilegacy repmgr version) |
244+
| postgresql-ha.postgresql.image.tag | string | `"17.6.0-debian-12-r2"` | PostgreSQL image tag (version 17.6.0) |
235245
| postgresql-ha.postgresql.password | string | `"gzctf"` | PostgreSQL superuser password (should be overridden or use secrets) |
236246
| postgresql-ha.postgresql.username | string | `"postgres"` | PostgreSQL superuser username |
237247
| postgresql-ha.volumePermissions.enabled | bool | `true` | Enable init container to set proper volume permissions |
248+
| postgresql-ha.volumePermissions.image.registry | string | `"docker.io"` | volume-permissions image registry |
249+
| postgresql-ha.volumePermissions.image.repository | string | `"bitnamilegacy/os-shell"` | volume-permissions image repository |
250+
| postgresql-ha.volumePermissions.image.tag | string | `"12-debian-12-r51"` | volume-permissions image tag |
238251
| postgresql.affinity | object | `{}` | Affinity rules for PostgreSQL pod scheduling |
239252
| postgresql.enabled | bool | `true` | Enable PostgreSQL deployment |
240253
| postgresql.env | list | `[{"name":"POSTGRES_PASSWORD","value":"gzctf"}]` | Environment variables for PostgreSQL container |

‎gzctf/README.md.gotmpl‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ helm install release-name . -f values.yaml --create-namespace --namespace gzctf
4242
helm uninstall release-name --namespace gzctf
4343
```
4444

45-
## Info
46-
- multi-node is still experimental (needs extensive testing)
47-
- postgresql-ha bitnami image is legacy/deprecated
45+
## Important Notes
46+
- multi-node deployment is still experimental (needs extensive testing)
47+
- gzctf support for s3 bucket is experimental (single-node deployment doesnt need s3 bucket)
48+
- garnet/redis is not needed for single-node deployment
49+
- minio stopped releasing community edition binaries and docker images [minio/minio/issues/21647](https://github.com/minio/minio/issues/21647)
50+
- postgresql-ha bitnami image is [legacy/deprecated](https://github.com/bitnami/containers/issues/83267)
4851

4952
## Values examples
5053

‎gzctf/values.yaml‎

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -408,20 +408,55 @@ postgresql-ha:
408408
# -- Enable or disable PostgreSQL HA deployment (THIS USES BITNAMI LEGACY IMAGES BY DEFAULT WHICH NO LONGER RECIEVE RPOPER SECURITY UPDATES)
409409
enabled: false
410410

411-
# Container image configuration
412-
image:
413-
# -- Docker registry for PostgreSQL image
414-
registry: docker.io
415-
# -- PostgreSQL repository (legacy repmgr version)
416-
repository: bitnamilegacy/postgresql-repmgr
417-
# -- PostgreSQL image tag (version 17.6.0)
418-
tag: 17.6.0-debian-12-r2
419-
411+
postgresql:
412+
# Container image configuration
413+
image:
414+
# -- Docker registry for PostgreSQL image
415+
registry: docker.io
416+
# -- PostgreSQL repository (bitnamilegacy repmgr version)
417+
repository: bitnamilegacy/postgresql-repmgr
418+
# -- PostgreSQL image tag (version 17.6.0)
419+
tag: 17.6.0-debian-12-r2
420+
# -- PostgreSQL superuser username
421+
username: "postgres"
422+
# -- PostgreSQL superuser password (should be overridden or use secrets)
423+
password: "gzctf"
424+
# -- Default database name to create
425+
database: "gzctf"
426+
427+
428+
pgpool:
429+
image:
430+
# -- pgpool image registry
431+
registry: docker.io
432+
# -- pgpool image repository
433+
repository: bitnamilegacy/pgpool
434+
# -- pgpool image tag
435+
tag: 4.6.3-debian-12-r0
436+
437+
metrics:
438+
# -- postgresql exporter enable
439+
enabled: false
440+
image:
441+
# -- postgres-exporter image registry
442+
registry: docker.io
443+
# -- postgres-exporter image repository
444+
repository: bitnamilegacy/postgres-exporter
445+
# -- postgres-exporter image tag
446+
tag: 0.17.1-debian-12-r16
447+
420448
# Volume permissions initialization
421449
volumePermissions:
422450
# -- Enable init container to set proper volume permissions
423451
enabled: true
424-
452+
image:
453+
# -- volume-permissions image registry
454+
registry: docker.io
455+
# -- volume-permissions image repository
456+
repository: bitnamilegacy/os-shell
457+
# -- volume-permissions image tag
458+
tag: 12-debian-12-r51
459+
425460
# Persistent storage configuration
426461
persistence:
427462
# -- Enable persistent volume for database storage
@@ -432,15 +467,6 @@ postgresql-ha:
432467
accessMode: ReadWriteOnce
433468
# -- Persistent volume size
434469
size: 2Gi
435-
436-
# PostgreSQL database configuration
437-
postgresql:
438-
# -- PostgreSQL superuser username
439-
username: "postgres"
440-
# -- PostgreSQL superuser password (should be overridden or use secrets)
441-
password: "gzctf"
442-
# -- Default database name to create
443-
database: "gzctf"
444470

445471
# MinIO object storage configuration (override the minio subchart values)
446472
minio:
@@ -492,5 +518,4 @@ minio:
492518
size: 10Gi
493519

494520
# -- Additional Kubernetes manifests to deploy with this Helm chart
495-
# @default -- []
496521
extraObjects: []

0 commit comments

Comments
 (0)