Skip to content

Commit

Permalink
Merge branch 'release/0.4.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
dlen committed Oct 9, 2023
2 parents bf8ee5e + 07ece0b commit a0cd60c
Show file tree
Hide file tree
Showing 9 changed files with 172 additions and 145 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
- env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
name: Create Release
run: gh release create "${GITHUB_REF#refs/*/}" --notes-file RELEASE_NOTES.md
run: gh release create "${GITHUB_REF#refs/*/}" -t "${GITHUB_REF#refs/*/}" --notes-file RELEASE_NOTES.md
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

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

## [0.4.4] - 2023-10-09

### Fixed
- [#52](https://github.com/passbolt/charts-passbolt/issues/52) pullPolicy incorrect rendering

## [0.4.3] - 2023-10-06

Expand All @@ -29,7 +34,7 @@ This release adds the ability to inject extra pod labels on passbolt pods and bu

### Fixed

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

## [0.4.0] - 2023-06-28

Expand Down
2 changes: 1 addition & 1 deletion 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: 0.4.3
version: 0.4.4

# 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
244 changes: 122 additions & 122 deletions README.md

Large diffs are not rendered by default.

18 changes: 4 additions & 14 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
This release introduces several fixes and enhancenments reported by
the community.
This is a small hotfix release that fixes issues reported
by the community regarding the imagePullPolicy on the
deployment resource.

It introduces the possibility to inject SSL certificates as external
secrets to both the ingress object and to the passbolt container
through the `tls.existingSecret`. By default the chart still relies
on the autogenerated SSL certificate if not specified.

[Deprecation warning]: ingress.tls will be deprecated in future
versions in favour of the new tls{} value to specify secrets.

[Deprecation warning]: ingress.hosts will be deprecated in future
versions too, new values will be announced.

For more information please check our [changelog](https://github.com/passbolt/charts-passbolt/blob/0.4.3/CHANGELOG.md)
For more information please check our [changelog](https://github.com/passbolt/charts-passbolt/blob/0.4.4/CHANGELOG.md)
4 changes: 2 additions & 2 deletions templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ spec:
> /etc/supervisor/conf.d/cron.conf
/docker-entrypoint.sh
image: {{ include "passbolt.image" (dict "imageRoot" .Values.app.image "global" .Values.global) }}
imagePullPolicy: .Values.app.image.pullPolicy
imagePullPolicy: {{ .Values.app.image.pullPolicy }}
ports:
- name: https
containerPort: {{ .Values.service.targetPort }}
Expand Down Expand Up @@ -142,7 +142,7 @@ spec:
{{- if .Values.app.cache.redis.sentinelProxy.enabled }}
- name: {{ $fullName }}-redisproxy
image: {{ include "passbolt.image" (dict "imageRoot" .Values.app.cache.redis.sentinelProxy.image "global" .Values.global) }}
imagePullPolicy: .Values.app.cache.redis.sentinelProxy.pullPolicy
imagePullPolicy: {{ .Values.app.cache.redis.sentinelProxy.pullPolicy }}
volumeMounts:
- mountPath: "/usr/local/etc/haproxy/haproxy.cfg"
subPath: haproxy.cfg
Expand Down
32 changes: 32 additions & 0 deletions tests/deployment_image_pull_policy_test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
suite: image pull policy
release:
name: test
values:
- values-test.yaml
tests:
- it: should have the correct pull policy
templates:
- deployment.yaml
set:
redis.auth.enabled: true
redis.replica.replicaCount: 2
autoscaling.enabled: false
app.cache.redis.sentinelProxy.enabled: true
app.cache.redis.sentinelProxy.image.repository: haproxy
app.cache.redis.sentinelProxy.image.tag: latest
app.cache.redis.sentinelProxy.pullPolicy: always
app.image.pullPolicy: always
app.initImage.pullPolicy: always
asserts:
- contains:
path: spec.template.spec.containers
content:
imagePullPolicy: always
count: 2
any: true
- contains:
path: spec.template.spec.initContainers
content:
imagePullPolicy: always
any: true
1 change: 0 additions & 1 deletion tests/deployment_redis_sidecar_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,3 @@ tests:
asserts:
- isNotEmpty:
path: spec.template.metadata.annotations.checksum/sec-redis-proxy

5 changes: 3 additions & 2 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,10 @@ service:
# -- Annotations to add to the service
annotations: {}


tls:
# -- Generates a secret with a self-signed cerfificate that is injected on ingress and passbolt container
autogenerate: true
# -- Name of an existing kubernetes secret that contains a SSL certificate to inject on ingress and passbolt container
#existingSecret: ""

ingress:
Expand All @@ -333,7 +334,7 @@ ingress:
pathType: ImplementationSpecific
# -- Configure passbolt ingress tls
tls:
# If secretname is not empty, the tls entry will use it, otherwise will
# If secretname is not empty, the tls entry will use it, otherwise will
# have a default name based on the release
# @ignored
- secretName: "tls"
Expand Down

0 comments on commit a0cd60c

Please sign in to comment.