Skip to content

Commit

Permalink
Merge branch 'release/4.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tecnobutrul committed Aug 11, 2023
2 parents 1106086 + cf3332e commit 53149bc
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 16 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased](https://github.com/passbolt/charts-passbolt/compare/0.4.0...HEAD)

## [0.4.1] - 2023-06-11

This release adds the ability to inject extra pod labels on passbolt pods and bumps the redis chart version.

### Added

- [#40](https://github.com/passbolt/charts-passbolt/issues/40) Added ability to inject extra pod labels

### Fixed

- [#41](https://github.com/passbolt/charts-passbolt/issues/41) Update Redis chart to v17.15.2

## [0.4.0] - 2023-06-28

This release includes breaking changes .Values.redisProxyResources now is .Values.app.cache.redis.sentinelProxy.resources
Expand Down
6 changes: 3 additions & 3 deletions Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ dependencies:
version: 0.2.7
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 17.3.8
version: 17.15.2
- name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 11.5.7
digest: sha256:e38b4a87c966a3e206a7670d892ad6f2b637940b5e2ad292c67ad2199430300b
generated: "2023-04-18T17:15:42.32691022+02:00"
digest: sha256:2b667ef711638e19c9541150634312e835a86608ba730c139408d98f85be6cc7
generated: "2023-08-10T18:47:01.974503483+02:00"
6 changes: 3 additions & 3 deletions Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ 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: 0.4.0
version: 0.4.1

# 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
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 4.0.2-2-ce
appVersion: 4.1.2-1-ce
dependencies:
- name: passbolt-library
version: 0.2.7
repository: "https://download.passbolt.com/charts/passbolt-library"
- name: redis
version: 17.3.8
version: 17.15.2
repository: "https://charts.bitnami.com/bitnami"
condition: redisDependencyEnabled
- name: mariadb
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<img src="./.assets/helm_passbolt.png" alt="passbolt sails kubernetes" width="500"/>
</h3>

![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.2-2-ce](https://img.shields.io/badge/AppVersion-4.0.2--2--ce-informational?style=flat-square)
![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.2-1-ce](https://img.shields.io/badge/AppVersion-4.1.2--1--ce-informational?style=flat-square)

Passbolt is an open source, security first password manager with strong focus on
collaboration.
Expand Down Expand Up @@ -92,7 +92,7 @@ chart and deletes the release.
| Repository | Name | Version |
|-------------------------------------------------------|------------------|---------|
| https://charts.bitnami.com/bitnami | mariadb | 11.5.7 |
| https://charts.bitnami.com/bitnami | redis | 17.3.8 |
| https://charts.bitnami.com/bitnami | redis | 17.15.2 |
| https://download.passbolt.com/charts/passbolt-library | passbolt-library | 0.2.7 |

## Values
Expand All @@ -106,6 +106,7 @@ chart and deletes the release.
| app.cache.redis.sentinelProxy.image.repository | string | `"haproxy"` | Configure redis sentinel image repository |
| app.cache.redis.sentinelProxy.image.tag | string | `"latest"` | Configure redis sentinel image tag |
| app.cache.redis.sentinelProxy.resources | object | `{}` | Configure redis sentinel container resources |
| app.extraPodLabels | object | `{}` | |
| app.image.pullPolicy | string | `"IfNotPresent"` | Configure pasbolt deployment image pullPolicy |
| app.image.repository | string | `"passbolt/passbolt"` | Configure pasbolt deployment image repsitory |
| app.image.tag | string | `"4.0.2-2-ce"` | Overrides the image tag whose default is the chart appVersion. |
Expand All @@ -118,7 +119,7 @@ chart and deletes the release.
| autoscaling.maxReplicas | int | `100` | Configure autoscaling maximum replicas |
| autoscaling.minReplicas | int | `1` | Configure autoscaling minimum replicas |
| autoscaling.targetCPUUtilizationPercentage | int | `80` | Configure autoscaling target CPU uptilization percentage |
| cronJobEmail | object | `{"enabled":true,"schedule":"* * * * *"}` | Enable email cron |
| cronJobEmail | object | `{"enabled":true,"extraPodLabels":{},"schedule":"* * * * *"}` | Enable email cron |
| extraVolumeMounts | string | `""` | Add additional volume mounts, e.g. for overwriting config files |
| extraVolumes | string | `""` | Add additional volumes, e.g. for overwriting config files |
| fullnameOverride | string | `""` | Value to override the whole fullName |
Expand All @@ -130,6 +131,7 @@ chart and deletes the release.
| ingress.enabled | bool | `false` | Enable passbolt ingress |
| ingress.hosts | list | `[]` | Configure passbolt ingress hosts |
| ingress.tls | list | `[]` | Configure passbolt ingress tls |
| jobCreateGpgKeys.extraPodLabels | object | `{}` | |
| jwtPath | string | `"/etc/passbolt/jwt"` | Configure passbolt jwt directory |
| jwtServerPrivate | string | `nil` | JWT server private key in base64 |
| jwtServerPublic | string | `nil` | JWT server public key in base64 |
Expand Down
3 changes: 3 additions & 0 deletions templates/cronjob-proc-email.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ spec:
metadata:
labels:
{{- include "passbolt-library.typelabels" (dict "action" $action "type" $type) | nindent 12 }}
{{- with .Values.cronJobEmail.extraPodLabels }}
{{- toYaml . | nindent 12 }}
{{- end }}
spec:
serviceAccountName: {{ $Name }}-sa-common
restartPolicy: OnFailure
Expand Down
3 changes: 3 additions & 0 deletions templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ spec:
metadata:
labels:
{{- include "passbolt-library.selectorLabels" . | nindent 8 }}
{{- with .Values.app.extraPodLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
annotations:
checksum/sec-env: {{ include (print $.Template.BasePath "/secret-env.yaml") . | sha256sum }}
checksum/sec-gpg: {{ include (print $.Template.BasePath "/secret-gpg.yaml") . | sha256sum }}
Expand Down
3 changes: 3 additions & 0 deletions templates/job-create-gpg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ spec:
metadata:
labels:
{{- include "passbolt-library.typelabels" (dict "action" $action "type" $type) | nindent 8 }}
{{- with .Values.jobCreateGpgKeys.extraPodLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
serviceAccountName: {{ $Name }}-sa-{{ $action }}
restartPolicy: OnFailure
Expand Down
37 changes: 37 additions & 0 deletions tests/deployment_extra_pod_labels_test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
---
suite: extra pod labels
release:
name: test
values:
- values-test.yaml
tests:
- it: deployment should have extra labels
templates:
- deployment.yaml
set:
app.extraPodLabels:
test-label: "test-value"
asserts:
- equal:
path: spec.template.metadata.labels.test-label
value: "test-value"
- it: job create gpgp keys should have extra labels
templates:
- job-create-gpg.yaml
set:
jobCreateGpgKeys.extraPodLabels:
test-label: "test-value"
asserts:
- equal:
path: spec.template.metadata.labels.test-label
value: "test-value"
- it: cronjob should have extra labels
templates:
- cronjob-proc-email.yaml
set:
cronJobEmail.extraPodLabels:
test-label: "test-value"
asserts:
- equal:
path: spec.jobTemplate.spec.template.metadata.labels.test-label
value: "test-value"
27 changes: 21 additions & 6 deletions tests/values-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ mariadb:
## Passbolt container and sidecar parameters
app:
initImage:
# -- Configure pasbolt deployment init container image client for database
client: mariadb
# -- Configure pasbolt deployment image repsitory
repository: mariadb
# -- Configure pasbolt deployment image pullPolicy
Expand All @@ -56,7 +58,7 @@ app:
# -- Configure pasbolt deployment image pullPolicy
pullPolicy: IfNotPresent
# -- Overrides the image tag whose default is the chart appVersion.
tag: 3.9.0-2-ce
tag: 4.1.2-1-ce
cache:
# Use CACHE_CAKE_DEFAULT_* variables to configure the connection to redis instance
# on the passboltEnv configuration section
Expand All @@ -74,20 +76,24 @@ app:
repository: haproxy
# -- Configure redis sentinel image tag
tag: "latest"
# -- Configure redis sentinel container resources
resources: {}
# -- Configure the passbolt deployment resources
podLabels: {}
resources: {}

# -- Enable email cron
cronJobEmail:
enabled: true
schedule: "* * * * *"
podLabels: {}

## Passbolt environment parameters

# -- Pro subscription key in base64 only if you are using pro version
subscriptionKey:
# subscriptionKey:
# -- Configure passbolt subscription key path
subscription_keyPath: /etc/passbolt/subscription_key.txt
# subscription_keyPath: /etc/passbolt/subscription_key.txt

# -- Configure passbolt gpg directory
gpgPath: /etc/passbolt/gpg
Expand All @@ -103,6 +109,9 @@ jwtServerPrivate:
# -- JWT server public key in base64
jwtServerPublic:

jobCreateGpgKeys:
podLabels: {}

passboltEnv:
plain:
# -- Configure passbolt privacy url
Expand All @@ -128,7 +137,7 @@ passboltEnv:
# -- Configure passbolt default email from
EMAIL_DEFAULT_FROM: [email protected]
# -- Configure passbolt default email host
EMAIL_TRANSPORT_DEFAULT_HOST:
EMAIL_TRANSPORT_DEFAULT_HOST: 127.0.0.1
# -- Toggle passbolt tls
EMAIL_TRANSPORT_DEFAULT_TLS: true
# -- Configure passbolt jwt private key path
Expand Down Expand Up @@ -211,15 +220,13 @@ networkPolicy:
# -- Configure network policies namespaceLabel for namespaceSelector
namespaceLabel: ingress-nginx


# -- Configure image pull secrets
imagePullSecrets: []
# -- Value to override the chart name on default
nameOverride: ""
# -- Value to override the whole fullName
fullnameOverride: ""


serviceAccount:
# -- Specifies whether a service account should be created
create: true
Expand All @@ -242,6 +249,8 @@ service:
targetPort: 443
# -- Configure passbolt service port name
name: https
# -- Annotations to add to the service
annotations: {}

ingress:
# -- Enable passbolt ingress
Expand Down Expand Up @@ -269,3 +278,9 @@ tolerations: []

# -- Configure passbolt deployment affinity
affinity: {}

# -- Add additional volumes, e.g. for overwriting config files
extraVolumes: ""

# -- Add additional volume mounts, e.g. for overwriting config files
extraVolumeMounts: ""
7 changes: 6 additions & 1 deletion values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ app:
# -- Configure pasbolt deployment image pullPolicy
pullPolicy: IfNotPresent
# -- Overrides the image tag whose default is the chart appVersion.
tag: 4.0.2-2-ce
tag: 4.1.2-1-ce
cache:
# Use CACHE_CAKE_DEFAULT_* variables to configure the connection to redis instance
# on the passboltEnv configuration section
Expand All @@ -123,12 +123,14 @@ app:
# -- Configure redis sentinel container resources
resources: {}
# -- Configure the passbolt deployment resources
extraPodLabels: {}
resources: {}

# -- Enable email cron
cronJobEmail:
enabled: true
schedule: "* * * * *"
extraPodLabels: {}

## Passbolt environment parameters

Expand All @@ -151,6 +153,9 @@ jwtServerPrivate:
# -- JWT server public key in base64
jwtServerPublic:

jobCreateGpgKeys:
extraPodLabels: {}

passboltEnv:
plain:
# -- Configure passbolt privacy url
Expand Down

0 comments on commit 53149bc

Please sign in to comment.