mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-08 18:16:59 +00:00
fix(helm): extract image tag to value (and use as default from Chart.… (#2934)
improve image tag handling on the default helm way.
with usage of appVersion from:
0995dc4822/helm/dendrite/Chart.yaml (L4)
maybe you like to review @S7evinK ?
### Pull Request Checklist
<!-- Please read
https://matrix-org.github.io/dendrite/development/contributing before
submitting your pull request -->
* [x] I have added Go unit tests or [Complement integration
tests](https://github.com/matrix-org/complement) for this PR _or_ I have
justified why this PR doesn't need tests
* [x] Pull request includes a [sign off below using a legally
identifiable
name](https://matrix-org.github.io/dendrite/development/contributing#sign-off)
_or_ I have already signed off privately
Signed-off-by: `Geno <geno+dev@fireorbit.de>`
This commit is contained in:
parent
b55a7c238f
commit
67f5c5bc1e
@ -1,7 +1,7 @@
|
|||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
name: dendrite
|
name: dendrite
|
||||||
version: "0.10.8"
|
version: "0.10.9"
|
||||||
appVersion: "0.10.8"
|
appVersion: "0.10.9"
|
||||||
description: Dendrite Matrix Homeserver
|
description: Dendrite Matrix Homeserver
|
||||||
type: application
|
type: application
|
||||||
keywords:
|
keywords:
|
||||||
|
@ -15,9 +15,11 @@
|
|||||||
|
|
||||||
|
|
||||||
{{- define "image.name" -}}
|
{{- define "image.name" -}}
|
||||||
image: {{ .name }}
|
{{- with .Values.image -}}
|
||||||
|
image: {{ .repository }}:{{ .tag | default (printf "v%s" $.Chart.AppVersion) }}
|
||||||
imagePullPolicy: {{ .pullPolicy }}
|
imagePullPolicy: {{ .pullPolicy }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Expand the name of the chart.
|
Expand the name of the chart.
|
||||||
|
@ -45,8 +45,8 @@ spec:
|
|||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ default (print ( include "dendrite.fullname" . ) "-search-pvc") $.Values.persistence.search.existingClaim | quote }}
|
claimName: {{ default (print ( include "dendrite.fullname" . ) "-search-pvc") $.Values.persistence.search.existingClaim | quote }}
|
||||||
containers:
|
containers:
|
||||||
- name: {{ $.Chart.Name }}
|
- name: {{ .Chart.Name }}
|
||||||
{{- include "image.name" $.Values.image | nindent 8 }}
|
{{- include "image.name" . | nindent 8 }}
|
||||||
args:
|
args:
|
||||||
- '--config'
|
- '--config'
|
||||||
- '/etc/dendrite/dendrite.yaml'
|
- '/etc/dendrite/dendrite.yaml'
|
||||||
|
@ -8,6 +8,7 @@ metadata:
|
|||||||
name: {{ $name }}
|
name: {{ $name }}
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/component: signingkey-job
|
app.kubernetes.io/component: signingkey-job
|
||||||
|
{{- include "dendrite.labels" . | nindent 4 }}
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: Role
|
kind: Role
|
||||||
@ -80,7 +81,7 @@ spec:
|
|||||||
name: signing-key
|
name: signing-key
|
||||||
readOnly: true
|
readOnly: true
|
||||||
- name: generate-key
|
- name: generate-key
|
||||||
{{- include "image.name" $.Values.image | nindent 8 }}
|
{{- include "image.name" . | nindent 8 }}
|
||||||
command:
|
command:
|
||||||
- sh
|
- sh
|
||||||
- -c
|
- -c
|
||||||
|
@ -13,5 +13,5 @@ spec:
|
|||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
port: 8008
|
port: {{ .Values.service.port }}
|
||||||
targetPort: 8008
|
targetPort: 8008
|
@ -1,8 +1,10 @@
|
|||||||
image:
|
image:
|
||||||
# -- Docker repository/image to use
|
# -- Docker repository/image to use
|
||||||
name: "ghcr.io/matrix-org/dendrite-monolith:v0.10.8"
|
repository: "ghcr.io/matrix-org/dendrite-monolith"
|
||||||
# -- Kubernetes pullPolicy
|
# -- Kubernetes pullPolicy
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
|
# Overrides the image tag whose default is the chart appVersion.
|
||||||
|
tag: ""
|
||||||
|
|
||||||
|
|
||||||
# signing key to use
|
# signing key to use
|
||||||
@ -345,4 +347,4 @@ ingress:
|
|||||||
|
|
||||||
service:
|
service:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
port: 80
|
port: 8008
|
||||||
|
Loading…
Reference in New Issue
Block a user