Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: make init dependencies image customizable #1021

Merged
merged 6 commits into from
Dec 17, 2024
Merged

feat: make init dependencies image customizable #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f1f8dc
feat: make `jwilder/dockerize` customizable
guilhem-barthes Dec 16, 2024
4c1a6c5
feat: make `postgres` customizable
guilhem-barthes Dec 16, 2024
439dc4d
feat: bump chart version
guilhem-barthes Dec 16, 2024
138eae6
fix: default version initImages as string
guilhem-barthes Dec 17, 2024
d07f4c9
chore: rename `initImages` values
guilhem-barthes Dec 17, 2024
3109d0f
fix: readme
guilhem-barthes Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions charts/substra-backend/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog

<!-- towncrier release notes start -->
## [26.15.0] - 2024-12-16

Bump app version to 1.0.0

## [26.14.2] - 2024-10-14

Expand Down
2 changes: 1 addition & 1 deletion charts/substra-backend/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: substra-backend
home: https://github.com/Substra
version: 26.14.2
version: 26.15.0
appVersion: 1.0.0
kubeVersion: '>= 1.19.0-0'
description: Main package for Substra
Expand Down
11 changes: 11 additions & 0 deletions charts/substra-backend/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,17 @@ See Bitnami documentation: https://bitnami.com/stack/postgresql/helm
| `hooks.deleteComputePods.image.repository` | Image repository for the hook image | `bitnami/kubectl` |
| `hooks.deleteComputePods.image.tag` | Image tag for the hook image | `latest` |

### Images

| Name | Description | Value |
| ---------------------------------- | ----------------------------------------- | ------------------- |
| `initImages.dockerize.repository` | Dockerize image | `jwilder/dockerize` |
| `initImages.dockerize.tag` | Dockerize injector tag | `0.6.1` |
| `initImages.dockerize.registry` | The registry to pull the Dockerize image | `docker.io` |
| `initImages.postgresql.repository` | PostgreSQL image | `postgres` |
| `initImages.postgresql.tag` | PostgreSQL tag | `17` |
| `initImages.postgresql.registry` | The registry to pull the PostgreSQL image | `docker.io` |


## Usage

Expand Down
6 changes: 3 additions & 3 deletions charts/substra-backend/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ The hostname we should connect to (external is defined, otherwise integrated)
{{- define "common.waitMinIOContainer" -}}
{{- if or .Values.minio.enabled .Values.localstack.enabled }}
- name: wait-minio
image: jwilder/dockerize:0.6.1
image: {{ include "common.images.name" $.Values.initImages.dockerize }}
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
Expand All @@ -257,7 +257,7 @@ The hostname we should connect to (external is defined, otherwise integrated)
{{- define "common.waitRedisInitContainer" -}}
{{- if .Values.redis.enabled }}
- name: wait-redis
image: jwilder/dockerize:0.6.1
image: {{ include "common.images.name" $.Values.initImages.dockerize }}
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
Expand All @@ -274,7 +274,7 @@ The hostname we should connect to (external is defined, otherwise integrated)
*/}}
{{- define "common.waitPostgresqlInitContainer" -}}
- name: wait-postgresql
image: postgres
image: {{ include "common.images.name" $.Values.initImages.postgresql }}
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
Expand Down
2 changes: 1 addition & 1 deletion charts/substra-backend/templates/deployment-registry-prepopulate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
spec:
initContainers:
- name: wait-registry
image: jwilder/dockerize:0.6.1
image: {{ include "common.images.name" $.Values.initImages.dockerize }}
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: false
Expand Down
18 changes: 18 additions & 0 deletions charts/substra-backend/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,3 +1185,21 @@ hooks:
image:
repository: bitnami/kubectl
tag: latest

## @section Images
##
initImages:
dockerize:
## @param initImages.dockerize.repository Dockerize image
## @param initImages.dockerize.tag Dockerize injector tag
## @param initImages.dockerize.registry The registry to pull the Dockerize image
registry: docker.io
repository: jwilder/dockerize
tag: "0.6.1"
postgresql:
## @param initImages.postgresql.repository PostgreSQL image
## @param initImages.postgresql.tag PostgreSQL tag
## @param initImages.postgresql.registry The registry to pull the PostgreSQL image
registry: docker.io
repository: postgres
tag: "17"
Loading