fix: volumeMounts in gzctf and wrong volumeMount path for postgresql

Author: ScribblerCoder

gzctf/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: gzctf
 description: A Helm chart for deploying GZCTF on Kubernetes
 type: application
-version: 0.1.1
+version: 0.1.2
 
 dependencies:
   - name: garnet

gzctf/README.md

@@ -1,5 +1,5 @@
 # GZCTF Helm Chart
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 [![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)
 
 This is a Helm chart for deploying GZCTF on Kubernetes. It deploys the official [GZCTF Docker image](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.

gzctf/templates/deployment.yaml

@@ -56,19 +56,26 @@ spec:
             {{- if and (not .Values.minio.enabled) (.Values.gzctf.pvc.create) }}
             - name: {{ include "gzctf.fullname" . }}
               mountPath: /app/files
+            {{- else if and (.Values.minio.enabled) (not .Values.gzctf.pvc.create) }}
+            - name: emptydir
+              mountPath: /app/files
             {{- end }}
             - name: {{ include "gzctf.fullname" . }}-appsettings
               mountPath: /app/appsettings.json
               subPath: appsettings.json
               readOnly: true
-          {{ with .Values.gzctf.volumeMounts }}
+          {{- with .Values.gzctf.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
       volumes:
-        {{ if and (not .Values.minio.enabled) (.Values.gzctf.pvc.create) -}}
+        {{- if and (not .Values.minio.enabled) (.Values.gzctf.pvc.create) -}}
         - name: {{ include "gzctf.fullname" . }}
           persistentVolumeClaim:
             claimName: {{ include "gzctf.fullname" . }}
+        {{- else if and (.Values.minio.enabled) (not .Values.gzctf.pvc.create) }}
+        - name: emptydir
+          emptyDir:
+            sizeLimit: 1Mi
         {{- end }}
         - name: {{ include "gzctf.fullname" . }}-appsettings
           secret:

gzctf/templates/postgresql/statefulset.yaml

@@ -70,7 +70,8 @@ spec:
           {{- end }}
           volumeMounts:
             - name: {{ include "gzctf.fullname" . }}-db
-              mountPath: /var/lib/postgresql
+              mountPath: /var/lib/postgresql/data
+              subPath: data
           {{- with .Values.postgresql.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}

gzctf/values.yaml

@@ -50,70 +50,14 @@ gzctf:
         //"RedisCache": "gzctf-garnet:6379,password=gzctf",
         //"Storage": "minio.s3://serviceUrl=gzctf-minio;keyId=gzctf;key=gzctf;bucket=gzctf-bucket"
       },
-      "Logging": {
-        "LogLevel": {
-          "Default": "Information",
-          "Microsoft": "Warning",
-          "Microsoft.Hosting.Lifetime": "Information"
-        },
-        "Loki": {
-          "Enable": false,
-          "EndpointUri": "http://loki:3100",
-          "Labels": [
-            {
-              "Key": "app",
-              "Value": "gzctf"
-            }
-          ],
-          "PropertiesAsLabels": ["app"],
-          "Credentials": {
-            "Login": "login",
-            "Password": "password"
-          },
-          "Tenant": "my-tenant",
-          "MinimumLevel": "Trace"
-        }
-      },
-      "Telemetry": {
-        "Prometheus": {
-          "Enable": false,
-          "Port": 3000,
-          "TotalNameSuffixForCounters": false
-        },
-        "OpenTelemetry": {
-          "Enable": false,
-          "Protocol": "Grpc",
-          "EndpointUri": "http://jaeger-collector:4317"
-        },
-        "AzureMonitor": {
-          "Enable": false,
-          "ConnectionString": "InstrumentationKey=12345678-abcd-abcd-abcd-12345678..."
-        },
-        "Console": {
-          "Enable": true
-        }
-      },
-      "EmailConfig": {
-        "SenderAddress": "",
-        "SenderName": "",
-        "UserName": "",
-        "Password": "",
-        "Smtp": {
-          "Host": "localhost",
-          "Port": 587,
-          "BypassCertVerify": false
-        }
-      },
       "XorKey": "gzctf",
       "ContainerProvider": {
         "Type": "Kubernetes",
         "PortMappingType": "Default",
         "EnableTrafficCapture": false,
         "PublicEntry": "ctf.example.com",
         "KubernetesConfig": {
-          // optional
           "Namespace": "gzctf-challenges",
-          "ConfigPath": "kube-config.yaml",
           "AllowCIDR": [
             "10.0.0.0/8"
           ],
@@ -122,55 +66,6 @@ gzctf:
             "223.5.5.5"
           ]
         }
-      },
-      "RequestLogging": false,
-      "DisableRateLimit": false,
-      "Registries": {
-        "ghcr.io": {
-          "UserName": "...",
-          "Password": "ghp_..."
-        },
-        "docker.io": {
-          "UserName": "...",
-          "Password": "..."
-        },
-        "your.custom.registry": {
-          "UserName": "...",
-          "Password": "..."
-        }
-      },
-      "CaptchaConfig": {
-        "Provider": "None", // or "CloudflareTurnstile" or "HashPow"
-        "SiteKey": "<Your SITE_KEY>",
-        "SecretKey": "<Your SECRET_KEY>"
-      },
-      "ForwardedOptions": {
-        "ForwardedHeaders": 5, // a flag enum, see following link
-        "ForwardLimit": 1,
-        "ForwardedForHeaderName": "X-Forwarded-For",
-        // use the following options to allow proxy
-        "TrustedNetworks": ["10.0.0.0/8"],
-        "TrustedProxies": ["10.0.0.1"]
-      },
-      "Kestrel": {
-        "Limits": {
-          "MaxResponseBufferSize": 2048,
-          "MaxRequestBufferSize": 1048576,
-          "MaxRequestLineSize": 8192,
-          "MaxRequestHeadersTotalSize": 32768,
-          "MaxRequestHeaderCount": 100,
-          "MaxRequestBodySize": 27262946,
-          "KeepAliveTimeout": "0.0:5:0",
-          "RequestHeadersTimeout": "0.0:5:0",
-          "MaxConcurrentConnections": null,
-          "MaxConcurrentUpgradedConnections": null
-        },
-        "AddServerHeader": true,
-        "AllowResponseHeaderCompression": true,
-        "AllowSynchronousIO": false,
-        "AllowAlternateSchemes": false,
-        "DisableStringReuse": false,
-        "ConfigurationLoader": null
       }
     }