Skip to content
Open
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 helm/taskchampion-sync-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: taskchampion-sync-server
description: A Helm chart for deploying TaskChampion Sync Server on Kubernetes
type: application
version: 0.1.2
version: 0.1.3
appVersion: "0.7.0"
keywords:
- taskchampion
Expand Down
24 changes: 24 additions & 0 deletions helm/taskchampion-sync-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ spec:
imagePullPolicy: {{ .Values.postgres.initContainer.imagePullPolicy }}
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
runAsUser: 1000
env:
- name: PGURI
valueFrom:
Expand Down Expand Up @@ -90,6 +92,16 @@ spec:
imagePullPolicy: {{ .Values.image.pullPolicy }}
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
runAsUser: 1092
readOnlyRootFilesystem: true
{{- if eq .Values.postgres.enabled true }}
command:
- /bin/taskchampion-sync-server-postgres
{{- else }}
command:
- /bin/taskchampion-sync-server
{{- end }}
env:
{{- range $name, $value := .Values.env }}
- name: {{ $name }}
Expand Down Expand Up @@ -117,6 +129,18 @@ spec:
- name: http
containerPort: {{ .Values.service.targetPort }}
protocol: TCP
livenessProbe:
httpGet:
path: /
port: http
initialDelaySeconds: 5
periodSeconds: 10
readinessProbe:
httpGet:
path: /
port: http
initialDelaySeconds: 5
periodSeconds: 10
{{- with .Values.resources }}
resources:
{{- toYaml . | nindent 12 }}
Expand Down
3 changes: 2 additions & 1 deletion helm/taskchampion-sync-server/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
automountServiceAccountToken: false
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
Expand All @@ -35,4 +36,4 @@ subjects:
- kind: ServiceAccount
name: {{ include "taskchampion-sync-server.fullname" . }}
namespace: {{ .Release.Namespace }}
{{- end -}}
{{- end -}}
14 changes: 7 additions & 7 deletions helm/taskchampion-sync-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ httpRoute:
port: 8080

# Resource limits and requests
resources: {}
# limits:
# memory: 128Mi
# cpu: 100m
# requests:
# memory: 64Mi
# cpu: 50m
resources:
limits:
memory: 25Mi
cpu: 100m
requests:
memory: 5Mi
cpu: 10m
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I imagine these will differ between sqlite and postgres? A 25Mi limit seems pretty small for sqlite, especially if that OOM's..


# Replica configuration (only applies when postgres is enabled)
replicas:
Expand Down
Loading