Merge pull request #225 from ViRb3/main

Migrate from bitnami to cloudpirates

Author: bman46

Chart.yaml

@@ -1,23 +1,21 @@
 apiVersion: v2
-version: 0.9.5
-appVersion: 3.7.6
+version: 0.9.6
+appVersion: 3.8.0
 description: A Helm chart for CTFd
 name: ctfd
 dependencies:
   - name: mariadb
-    version: 20.2.2
-    repository: https://charts.bitnami.com/bitnami
+    version: 0.3.0
+    repository: oci://registry-1.docker.io/cloudpirates
     condition: mariadb.enabled
   - name: redis
-    version: 20.7.1
-    repository: https://charts.bitnami.com/bitnami
+    version: 0.4.6
+    repository: oci://registry-1.docker.io/cloudpirates
     condition: redis.enabled
 home: https://github.com/bman46/CTFd-Helm
 icon: https://raw.githubusercontent.com/CTFd/CTFd/master/CTFd/themes/core/static/img/logo.png
 sources:
-  - https://gitlab.com/momothereal/helm-charts
-  - https://github.com/bitnami/charts/tree/master/bitnami/mariadb-galera
-  - https://github.com/bitnami/charts/tree/master/bitnami/redis
+  - https://github.com/CloudPirates-io/helm-charts
   - https://ctfd.io/
 keywords:
   - ctfd

templates/_helpers.tpl

@@ -34,7 +34,7 @@ Create database vars
 {{- if .Values.mariadb.enabled -}}
 {{- printf "mysql+pymysql://%s:%s@%s-mariadb.%s/%s" .Values.mariadb.auth.username .Values.mariadb.auth.password .Release.Name .Release.Namespace .Values.mariadb.auth.database -}}
 {{- else -}}
-{{- .values.externalDB.DATABASE_URL -}}
+{{- .Values.externalDB.DATABASE_URL -}}
 {{- end -}}
 {{- end -}}
 
@@ -44,11 +44,11 @@ Create redis DB vars
 {{- define "ctfd.REDIS_URL" -}}
 {{- if .Values.redis.enabled -}}
 {{- if .Values.redis.auth.enabled -}}
-{{- printf "redis://:%s@%s-redis-master.%s" .Values.redis.auth.password .Release.Name .Release.Namespace -}}
+{{- printf "redis://:%s@%s-redis.%s" .Values.redis.auth.password .Release.Name .Release.Namespace -}}
 {{- else -}}
-{{- printf "redis://%s-redis-master.%s" .Release.Name .Release.Namespace -}}
+{{- printf "redis://%s-redis.%s" .Release.Name .Release.Namespace -}}
 {{- end -}}
 {{- else -}}
-{{- .values.externalDB.REDIS_URL -}}
+{{- .Values.externalDB.REDIS_URL -}}
 {{- end -}}
 {{- end -}}

templates/deployment.yaml

@@ -34,7 +34,7 @@ spec:
           command: ['sh', '-c', 'echo -e "Checking for the availability of Redis Server deployment"; while ! nc -z $redisServer 6379; do sleep 1; printf "-"; done; echo -e "  >> Redis Server has started";']
           env:
             - name: redisServer
-              value: {{ printf "%s-redis-master" .Release.Name }}
+              value: {{ printf "%s-redis" .Release.Name }}
         {{- end }}
         {{- if .Values.mariadb.enabled }}
         - name: mysql-wait

values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: ctfd/ctfd
-  tag: # defaults to chart version. Optionally, override here
+  tag: "" # Leave empty to use chart default, or specify version like "3.8.0"
   pullPolicy: IfNotPresent
 
 # Set K8s securityContext for the CTFd deployment:
@@ -19,7 +19,10 @@ security:
 # See bitnami redis values.yaml for more details
 redis:
   # Enable Redis server provided by helm:
-  enabled: True
+  enabled: true
+  # Override Redis image (optional)
+  # image:
+  #   tag: "8.2.0"
   auth:
     enabled: true
     password: "ChangeMe!123"
@@ -28,17 +31,17 @@ redis:
 
 mariadb:
   # Enable mariadb server provided by helm:
-  enabled: True
+  enabled: true
+  # Override MariaDB image tag (optional)
+  # image:
+  #   tag: "11.8.2"
   # Login credentials:
   auth:
     rootPassword: "ChangeMe!123"
     database: ctfd
     username: "ctfd"
     password: "ChangeMe!123"
 
-    replicationUser: "replicate"
-    replicationPassword: "ChangeMe!123"
-
   persistence:
     enabled: true
     storageClass: ""
@@ -59,7 +62,7 @@ env:
     # Amount of CTFd workers
     WORKERS: 5
     # If behing ingress proxy or nginx:
-    REVERSE_PROXY: True 
+    REVERSE_PROXY: true 
   secret:
   existingSecret:
   # Stores Environment Variable to secret key name mappings
@@ -167,4 +170,4 @@ metrics:
     ## [Prometheus Selector Label](https://github.com/helm/charts/tree/master/stable/prometheus-operator#prometheus-operator-1)
     ## [Kube Prometheus Selector Label](https://github.com/helm/charts/tree/master/stable/prometheus-operator#exporters)
     selector:
-      prometheus: kube-prometheus
+      prometheus: kube-prometheus