diff --git a/charts/README.md b/charts/README.md index 062ce08..d9a4664 100644 --- a/charts/README.md +++ b/charts/README.md @@ -1,3 +1,21 @@ +# Starting Databunker with MySQL backend + +## Start Databunker with auto-generated self-signed SSL certificate +``` +helm install --debug databunker ./databunker --set mariadb.primary.persistence.enabled=false --set certificates.customCAs\[0\].secret="databunker" +``` + +## Start Databunker for local testing +``` +helm install --debug databunker ./databunker --set mariadb.primary.persistence.enabled=false --set certificates.customCAs\[0\].secret="databunker" + +export POD_NAME=$(kubectl get pods --namespace default -l "app.kubernetes.io/name=databunker,app.kubernetes.io/instance=databunker" -o jsonpath="{.items[0].metadata.name}") +export CONTAINER_PORT=$(kubectl get pod --namespace default $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") +echo "Visit http://127.0.0.1:8080 to use your application" +kubectl --namespace default port-forward $POD_NAME 8080:$CONTAINER_PORT +``` + + # Starting Databunker DEMO pod using Kubernetes You can run the following command: diff --git a/charts/databunker/README.md b/charts/databunker/README.md index 57db922..eb80939 100644 --- a/charts/databunker/README.md +++ b/charts/databunker/README.md @@ -83,7 +83,7 @@ The command removes all the Kubernetes components associated with the chart and | `databunkerHost` | Databunker host to create application URLs | `""` | | `databunkerMasterkey` | Databunker Master Key | `""` | | `databunkerRoottoken` | Databunker Root Token | `""` | -| `databunkerEmail` | Admin email | `user@example.com` | +| `databunkerAdminEmail` | Admin email | `user@example.com` | | `databunkerExtraInstallArgs` | Databunker extra install args | `""` | | `command` | Override default container command (useful when using custom images) | `[]` | | `args` | Override default container args (useful when using custom images) | `[]` | diff --git a/charts/databunker/templates/deployment.yaml b/charts/databunker/templates/deployment.yaml index ea43441..4e6f697 100644 --- a/charts/databunker/templates/deployment.yaml +++ b/charts/databunker/templates/deployment.yaml @@ -92,7 +92,7 @@ spec: secretKeyRef: name: {{ include "databunker.databaseSecretName" . }} key: {{ include "databunker.databasePasswordKey" . | quote }} - - name: DRUPAL_SKIP_BOOTSTRAP + - name: SKIP_BOOTSTRAP value: {{ ternary "yes" "no" .Values.databunkerSkipInstall | quote }} - name: DATABUNKER_MASTERKEY valueFrom: @@ -104,8 +104,8 @@ spec: secretKeyRef: name: {{ include "databunker.secretName" . }} key: databunker-roottoken - - name: DRUPAL_EMAIL - value: {{ .Values.databunkerEmail | quote }} + - name: ADMIN_EMAIL + value: {{ .Values.databunkerAdminEmail | quote }} {{- if .Values.smtpHost }} - name: SMTP_HOST value: {{ .Values.smtpHost | quote }} diff --git a/charts/databunker/templates/secrets.yaml b/charts/databunker/templates/secrets.yaml index 5a06a2f..6e7421b 100644 --- a/charts/databunker/templates/secrets.yaml +++ b/charts/databunker/templates/secrets.yaml @@ -16,7 +16,7 @@ data: {{- if .Values.databunkerMasterkey }} databunker-masterkey: {{ default "" .Values.databunkerMasterkey | b64enc | quote }} {{- else }} - databunker-masterkey: {{ substr 1 49 (printf "%x%x%x%x" (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) ) | b64enc | quote }} + databunker-masterkey: {{ substr 1 49 (printf "%x%x%x%x%x" (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) (int64 (randNumeric 18)) ) | b64enc | quote }} {{- end }} {{- if .Values.databunkerRoottoken }} databunker-roottoken: {{ default "" .Values.databunkerRoottoken | b64enc | quote }} diff --git a/charts/databunker/values.yaml b/charts/databunker/values.yaml index f9f49fa..6c54f70 100644 --- a/charts/databunker/values.yaml +++ b/charts/databunker/values.yaml @@ -96,16 +96,16 @@ databunkerMasterkey: "" ## ref: https://github.com/bitnami/bitnami-docker-databunker#configuration ## databunkerRoottoken: "" -## @param databunkerEmail Admin email +## @param databunkerAdminEmail Admin email ## ref: https://github.com/bitnami/bitnami-docker-databunker#configuration ## -databunkerEmail: user@example.com +databunkerAdminEmail: "user@example.com" ## @param command Override default container command (useful when using custom images) ## command: ["/bin/sh"] ## @param args Override default container args (useful when using custom images) ## -args: ["-c", "/bin/busybox sleep 22; /databunker/bin/databunker -init -db databunkerdb; /databunker/bin/databunker -db databunkerdb -conf /databunker/conf/databunker.yaml" ] +args: ["-c", "/databunker/bin/databunker -init -db databunkerdb; /databunker/bin/databunker -db databunkerdb -conf /databunker/conf/databunker.yaml" ] ## @param updateStrategy.type Update strategy - only really applicable for deployments with RWO PVs attached ## If replicas = 1, an update can get "stuck", as the previous pod remains attached to the ## PV, and the "incoming" pod can never start. Changing the strategy to "Recreate" will @@ -700,8 +700,8 @@ certificates: chainLocation: /etc/ssl/certs/mychain.pem ## @param certificates.customCAs Defines a list of secrets to import into the container trust store ## - customCAs: - - secret: "databunker" + customCAs: [] + # - secret: "databunker" ## @param certificates.command Override default container command (useful when using custom images) ## e.g: ## - secret: custom-CA