Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion charts/deployment/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
description: A Helm chart for Kubernetes
# name can only be lowercase. It is used in the templates.
name: deployment
version: 3.9.0
version: 3.10.0
15 changes: 12 additions & 3 deletions charts/deployment/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ spec:
fieldPath: metadata.uid
- name: OTEL_RESOURCE_ATTRIBUTES
value: "k8s.pod.uid=$(POD_UID)"
{{- if .Values.image.envFrom }}
envFrom:
{{- toYaml .Values.image.envFrom | nindent 12 }}
{{- end }}
ports:
- containerPort: {{ .Values.service.internalPort }}
resources:
Expand All @@ -100,7 +104,7 @@ spec:
mountPath: {{ $mount.mountPath }}
{{- end }}
- name: app-secrets-volume
mountPath: /mnt/app-secrets
mountPath: {{ .Values.appSecrets.mountPath }}
readOnly: true
{{- if .Values.startup.enabled}}
startupProbe:
Expand Down Expand Up @@ -147,5 +151,10 @@ spec:
{{- end }}
{{- end }}
- name: app-secrets-volume
secret:
secretName: {{ template "fullname" . }}-secrets
projected:
sources:
- secret:
name: {{ template "fullname" . }}-secrets
{{- with .Values.appSecrets.additionalSources }}
{{- toYaml . | nindent 14 }}
{{- end }}
26 changes: 26 additions & 0 deletions charts/deployment/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ image:
tag: latest
pullPolicy: Always
pullSecrets: []
envFrom: []
# Additional environment variable sources.
# Example:
# envFrom:
# - configMapRef:
# name: apps-runtime-common-config-env
# - secretRef:
# name: apps-runtime-common-secrets-env
# - name: myRegistryKeySecretName

service:
Expand Down Expand Up @@ -91,6 +99,24 @@ volumes:
secret:
secretName: accesstoken

appSecrets:
mountPath: /mnt/app-secrets
additionalSources: []
# Additional projected volume sources merged into appSecrets.mountPath.
# Example:
# additionalSources:
# - configMap:
# name: apps-runtime-common-config
# items:
# - key: runtime-common.json
# path: runtime-common.json
# - secret:
# name: apps-runtime-common-secrets
# optional: true
# items:
# - key: runtime-common-secrets.json
# path: runtime-common-secrets.json

startup:
enabled: false
path: /health
Expand Down