Skip to content
This repository has been archived by the owner on Sep 5, 2023. It is now read-only.

Commit

Permalink
Modify config for our needs
Browse files Browse the repository at this point in the history
  • Loading branch information
michizubi-SRF committed Nov 7, 2022
1 parent c52f879 commit 0f688f5
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 79 deletions.
15 changes: 6 additions & 9 deletions Chart.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
dependencies:
- name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 11.3.0
version: 11.3.4
- name: mariadb-galera
repository: https://charts.bitnami.com/bitnami
version: 7.4.1
version: 7.4.7
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 17.1.5
version: 17.3.8
- name: redis-cluster
repository: https://charts.bitnami.com/bitnami
version: 8.2.2
- name: passbolt-ha-monitor
repository: https://anatomicjc.gitlab.io/helm-charts
version: 0.0.6
digest: sha256:a7c45328631ef60e5958b9702afb860b3f7d3c630c3d9fa1e263540ff0d31146
generated: "2022-09-14T16:36:41.289695302+02:00"
version: 8.2.7
digest: sha256:6dfc7faef13eac7ac1979d63d7b1f5b52e381736f8b0e54755d7216e140e0272
generated: "2022-11-07T17:04:33.735304+01:00"
10 changes: 5 additions & 5 deletions Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.7.1
version: 1.8.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down Expand Up @@ -50,7 +50,7 @@ dependencies:
version: ">8.2.0"
repository: https://charts.bitnami.com/bitnami
condition: redis-cluster.enabled
- name: passbolt-ha-monitor
version: ">=0.0.6"
repository: https://anatomicjc.gitlab.io/helm-charts
condition: passbolt-ha-monitor.enabled
# - name: passbolt-ha-monitor
# version: ">=0.0.6"
# repository: https://anatomicjc.gitlab.io/helm-charts
# condition: passbolt-ha-monitor.enabled
2 changes: 1 addition & 1 deletion templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
/usr/bin/wait-for.sh -t 0 ${DATASOURCES_DEFAULT_HOST}:3306 -- /docker-entrypoint.sh"
env:
- name: APP_FULL_BASE_URL
value: {{ index .Values.ingress.hosts 0 "scheme" }}://{{ index .Values.ingress.hosts 0 "host" }}
value: {{ .Values.ingress.scheme }}://{{ .Values.ingress.host}}
- name: DATASOURCES_DEFAULT_HOST
{{- if .Values.mariadb.enabled }}
value: {{ .Release.Name }}-mariadb
Expand Down
15 changes: 0 additions & 15 deletions templates/tests/test-connection.yaml

This file was deleted.

10 changes: 8 additions & 2 deletions values-ha.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ image:
repository: passbolt/passbolt
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "3.7.3-1-ce"
tag: "3.7.3-1-pro"
passbolt:
config:
license:
Expand Down Expand Up @@ -75,11 +75,17 @@ redis:
automateClusterRecovery: true
auth:
password: "redispassword"
global:
storageClass: ""

redis-cluster:
enabled: false
password: "redisclusterpassword"

passbolt-ha-monitor:
enabled: true
enabled: false
redisCliAuth: "redispassword"
# securityContext:
# runAsUser: 1000
# runAsGroup: 1000
# runAsNonRoot: true
68 changes: 21 additions & 47 deletions values.yaml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
# Default values for passbolt-helm.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

---
# For the database init, replicaCount must be set to 1
# You can scale once the DB initialized
replicaCount: 1

image:
repository: passbolt/passbolt
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "3.7.1-1-ce"

topologySpreadConstraints: []
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
podLabels: {}

# Passbolt configuration
tag: "3.7.3-1-pro"
passbolt:
persistence:
enabled: true
## passbolt application Persistent Volume Storage Class
## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning
## If undefined (the default) or set to null, no storageClassName spec is
## set, choosing the default provisioner. (gp2 on AWS, standard on
## GKE, AWS & OpenStack)
##
# storageClass: "-"
accessMode: ReadWriteMany
size: 1Gi
firstAdmin:
email: admin@domain.tld
name: "Admin"
surname: "Passbolt"
config:
debug: false
registration: false
php:
max_execution_time: 300
memory_limit: "512M"
Expand All @@ -44,10 +44,6 @@ passbolt:
lifetime: 3600
redis:
enabled: false
# Redis Cluster
#service: passbolt-redis-cluster
# Redis Sentinel
service: "passbolt-redis-node-0.passbolt-redis-headless"
salt: "your salt"
gpgServerKeyFingerprint: ""
# serverkey_private:
Expand Down Expand Up @@ -87,24 +83,8 @@ serviceAccount:
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: ""

podAnnotations: {}

podSecurityContext: {}
# fsGroup: 2000

securityContext: {}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000

# Database (dependency:mariadb)
mariadb:
enabled: true
## @param architecture MariaDB architecture (`standalone` or `replication`)
Expand Down Expand Up @@ -161,16 +141,11 @@ ingress:
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts:
- host: localhost
scheme: http
paths:
- path: /
pathType: ImplementationSpecific
tls: []
# - secretName: chart-example-tls
# hosts:
# - chart-example.local
host: localhost
scheme: https
paths:
- path: /
pathType: ImplementationSpecific

resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
Expand All @@ -196,4 +171,3 @@ nodeSelector: {}
tolerations: []

affinity: {}

0 comments on commit 0f688f5

Please sign in to comment.