Skip to content

Commit b4b52e5

Browse files
authored
🚚 release helm chart (#323)
2 parents e5853bb + cd75d95 commit b4b52e5

File tree

8 files changed

+31
-13
lines changed

8 files changed

+31
-13
lines changed

charts/diode/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: diode
33
description: A Helm chart for Diode
44
type: application
5-
version: 1.3.0
6-
appVersion: "1.0.0"
5+
version: 1.4.0
6+
appVersion: "1.1.0"
77
home: https://github.com/netboxlabs/diode
88
sources:
99
- https://github.com/netboxlabs/diode

charts/diode/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
A Helm chart for Diode
44

5-
![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
5+
![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square)
66

77
## Prerequisites
88

@@ -236,15 +236,15 @@ helm show values diode/diode
236236
| diodeAuth.image.imagePullSecrets | list | `[]` | secrets with credentials to pull images from a private registry |
237237
| diodeAuth.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
238238
| diodeAuth.image.repository | string | `"docker.io/netboxlabs/diode-auth"` | image repository |
239-
| diodeAuth.image.tag | string | `"1.0.0"` | image tag |
239+
| diodeAuth.image.tag | string | `"1.1.0"` | image tag |
240240
| diodeAuth.replicaCount | int | `1` | replica count |
241241
| diodeAuth.resources | object | `{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}` | resources |
242242
| diodeAuth.serviceAccount.create | bool | `true` | create service account |
243243
| diodeAuthBootstrap.enabled | bool | `true` | enabled |
244244
| diodeAuthBootstrap.image.imagePullSecrets | list | `[]` | secrets with credentials to pull images from a private registry |
245245
| diodeAuthBootstrap.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
246246
| diodeAuthBootstrap.image.repository | string | `"docker.io/netboxlabs/diode-auth"` | image repository |
247-
| diodeAuthBootstrap.image.tag | string | `"1.0.0"` | image tag |
247+
| diodeAuthBootstrap.image.tag | string | `"1.1.0"` | image tag |
248248
| diodeAuthBootstrap.job.backoffLimit | int | `20` | backoff limit |
249249
| diodeIngester.config.loggingLevel | string | `"INFO"` | logging level |
250250
| diodeIngester.config.redisStreamDb | int | `1` | redis stream db |
@@ -259,7 +259,7 @@ helm show values diode/diode
259259
| diodeIngester.image.imagePullSecrets | list | `[]` | secrets with credentials to pull images from a private registry |
260260
| diodeIngester.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
261261
| diodeIngester.image.repository | string | `"docker.io/netboxlabs/diode-ingester"` | image repository |
262-
| diodeIngester.image.tag | string | `"1.0.0"` | image tag |
262+
| diodeIngester.image.tag | string | `"1.1.0"` | image tag |
263263
| diodeIngester.replicaCount | int | `1` | replica count |
264264
| diodeIngester.resources | object | `{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}` | resources |
265265
| diodeIngester.serviceAccount.create | bool | `true` | create service account |
@@ -288,16 +288,16 @@ helm show values diode/diode
288288
| diodeReconciler.image.imagePullSecrets | list | `[]` | secrets with credentials to pull images from a private registry |
289289
| diodeReconciler.image.pullPolicy | string | `"IfNotPresent"` | pull policy |
290290
| diodeReconciler.image.repository | string | `"docker.io/netboxlabs/diode-reconciler"` | image repository |
291-
| diodeReconciler.image.tag | string | `"1.0.0"` | image tag |
291+
| diodeReconciler.image.tag | string | `"1.1.0"` | image tag |
292292
| diodeReconciler.replicaCount | int | `1` | replica count |
293293
| diodeReconciler.resources | object | `{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}` | resources |
294294
| diodeReconciler.serviceAccount.create | bool | `true` | create service account |
295295
| externalPostgresql.hostname | string | `"localhost"` | hostname |
296296
| externalPostgresql.port | int | `5432` | port |
297297
| externalRedis.hostname | string | `"localhost"` | hostname |
298298
| externalRedis.port | int | `6379` | port |
299-
| global.diode | object | `{"busybox":{"image":"busybox:latest"},"hydra":{"waitForPostgres":true}}` | diode global configuration |
300-
| global.diode.busybox | object | `{"image":"busybox:latest"}` | busybox image configuration |
299+
| global.diode | object | `{"busybox":{"image":"busybox:latest","imagePullPolicy":"IfNotPresent"},"hydra":{"waitForPostgres":true}}` | diode global configuration |
300+
| global.diode.busybox | object | `{"image":"busybox:latest","imagePullPolicy":"IfNotPresent"}` | busybox image configuration |
301301
| global.diode.hydra | object | `{"waitForPostgres":true}` | hydra additional init containers configuration |
302302
| global.diode.hydra.waitForPostgres | bool | `true` | wait for PostgreSQL |
303303
| hydra | object | `{"deployment":{"extraInitContainers":"{{ include \"diode.hydra.extrainitcontainers\" . }}","resources":{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}},"enabled":true,"fullnameOverride":"diode-hydra","hydra":{"automigration":{"enabled":true},"config":{"oidc":{"subject_identifiers":{"supported_types":["public"]}},"strategies":{"access_token":"jwt","jwt":{"scope_claim":"both"}},"ttl":{"access_token":"1h"},"urls":{"self":{"issuer":"http://diode-hydra-public.{{ .Release.Namespace }}.svc.cluster.local:4444"}}},"dev":true,"ingress":{"admin":{"enabled":false},"public":{"enabled":false}},"service":{"admin":{"enabled":true,"port":4445,"type":"ClusterIP"},"public":{"enabled":true,"port":4444,"type":"ClusterIP"}}},"job":{"annotations":{"helm.sh/hook":"post-install, post-upgrade","helm.sh/hook-delete-policy":"hook-succeeded","helm.sh/hook-weight":"1"},"extraInitContainers":"{{ include \"diode.hydra.extrainitcontainers\" . }}"},"secret":{"enabled":false,"nameOverride":"diode-hydra-secret"}}` | ref: https://github.com/ory/k8s/blob/master/helm/charts/hydra/values.yaml |

charts/diode/templates/_helpers.tpl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,17 @@ Create the name of the busybox image to use
6969
{{- end -}}
7070
{{- end }}
7171

72+
{{/*
73+
Create the image pull policy of the busybox image to use
74+
*/}}
75+
{{- define "diode.busybox.imagepullpolicy" -}}
76+
{{- if .Values.global.diode.busybox.imagePullPolicy -}}
77+
{{- .Values.global.diode.busybox.imagePullPolicy | quote -}}
78+
{{- else -}}
79+
{{- "IfNotPresent" | quote -}}
80+
{{- end -}}
81+
{{- end }}
82+
7283
{{/*
7384
Create the name of the auth service to use
7485
*/}}
@@ -333,6 +344,7 @@ Create the name of the extra Hydra init container configmap to use
333344
{{- if .Values.global.diode.hydra.waitForPostgres -}}
334345
- name: wait-for-postgres
335346
image: {{ .Values.global.diode.busybox.image }}
347+
imagePullPolicy: {{ .Values.global.diode.busybox.imagePullPolicy }}
336348
command: ['sh', '-c', 'until nc -zv $POSTGRES_HOST $POSTGRES_PORT; do echo waiting for PostgreSQL; sleep 2; done;']
337349
envFrom:
338350
- configMapRef:

charts/diode/templates/diode-auth-bootstrap-job.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ spec:
2424
{{- if .Values.hydra.enabled }}
2525
- name: wait-for-oauth2-server
2626
image: {{ include "diode.busybox.image" . }}
27+
imagePullPolicy: {{ include "diode.busybox.imagepullpolicy" . }}
2728
command:
2829
- sh
2930
- -c

charts/diode/templates/diode-auth-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ spec:
3333
{{- if .Values.hydra.enabled }}
3434
- name: wait-for-oauth2-server
3535
image: {{ include "diode.busybox.image" . }}
36+
imagePullPolicy: {{ include "diode.busybox.imagepullpolicy" . }}
3637
command:
3738
- sh
3839
- -c

charts/diode/templates/diode-ingester-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ spec:
3333
{{- if .Values.redis.enabled }}
3434
- name: wait-for-redis
3535
image: {{ include "diode.busybox.image" . }}
36+
imagePullPolicy: {{ include "diode.busybox.imagepullpolicy" . }}
3637
command:
3738
- sh
3839
- -c

charts/diode/templates/diode-reconciler-deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ spec:
3333
{{- if .Values.redis.enabled }}
3434
- name: wait-for-redis
3535
image: {{ include "diode.busybox.image" . }}
36+
imagePullPolicy: {{ include "diode.busybox.imagepullpolicy" . }}
3637
command:
3738
- sh
3839
- -c
@@ -46,6 +47,7 @@ spec:
4647
{{- if .Values.postgresql.enabled }}
4748
- name: wait-for-postgres
4849
image: {{ include "diode.busybox.image" . }}
50+
imagePullPolicy: {{ include "diode.busybox.imagepullpolicy" . }}
4951
command:
5052
- sh
5153
- -c

charts/diode/values.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ global:
44
# -- busybox image configuration
55
busybox:
66
image: busybox:latest
7+
imagePullPolicy: IfNotPresent
78
# -- hydra additional init containers configuration
89
hydra:
910
# -- wait for PostgreSQL
@@ -35,7 +36,7 @@ diodeAuth:
3536
# -- image repository
3637
repository: docker.io/netboxlabs/diode-auth
3738
# -- image tag
38-
tag: 1.0.0
39+
tag: 1.1.0
3940
# -- secrets with credentials to pull images from a private registry
4041
imagePullSecrets: [ ]
4142
# -- pull policy
@@ -75,7 +76,7 @@ diodeAuthBootstrap:
7576
# -- image repository
7677
repository: docker.io/netboxlabs/diode-auth
7778
# -- image tag
78-
tag: 1.0.0
79+
tag: 1.1.0
7980
# -- secrets with credentials to pull images from a private registry
8081
imagePullSecrets: [ ]
8182
# -- pull policy
@@ -92,7 +93,7 @@ diodeIngester:
9293
# -- image repository
9394
repository: docker.io/netboxlabs/diode-ingester
9495
# -- image tag
95-
tag: 1.0.0
96+
tag: 1.1.0
9697
# -- secrets with credentials to pull images from a private registry
9798
imagePullSecrets: [ ]
9899
# -- pull policy
@@ -139,7 +140,7 @@ diodeReconciler:
139140
# -- image repository
140141
repository: docker.io/netboxlabs/diode-reconciler
141142
# -- image tag
142-
tag: 1.0.0
143+
tag: 1.1.0
143144
# -- secrets with credentials to pull images from a private registry
144145
imagePullSecrets: [ ]
145146
# -- pull policy

0 commit comments

Comments
 (0)