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
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Service environment variables
{{- range .Values.outpost.env }}
- name: {{ .name }}
{{- if .value }}
value: {{ .value }}
value: {{ .value | quote }}
{{- else if .valueFrom }}
valueFrom:
{{- toYaml .valueFrom | nindent 4 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,59 @@ spec:
labels:
app: outpost-api
{{- include "outpost.labels" . | nindent 8 }}
{{- with .Values.outpost.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.outpost.serviceAccountName }}
serviceAccountName: {{ . }}
{{- end }}
{{- with .Values.outpost.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ include "outpost.name" . }}-api
image: {{ .Values.outpost.image.repository }}:{{ .Values.outpost.image.tag }}
imagePullPolicy: {{ .Values.outpost.image.pullPolicy }}
{{- with .Values.outpost.securityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.outpost.resources.api }}
resources:
{{- toYaml .Values.outpost.resources.api | nindent 12 }}
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
containerPort: 3333
protocol: TCP
livenessProbe:
httpGet:
path: /api/v1/healthz
port: http
initialDelaySeconds: 10
periodSeconds: 30
readinessProbe:
httpGet:
path: /api/v1/healthz
port: http
initialDelaySeconds: 5
periodSeconds: 10
volumeMounts:
- name: config
mountPath: /config/outpost
{{- with .Values.outpost.extraVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
env:
- name: SERVICE
value: api
Expand All @@ -45,10 +80,29 @@ spec:
fieldRef:
fieldPath: spec.nodeName
{{- include "outpost.env" . | nindent 12 }}
{{- with .Values.outpost.envFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.outpost.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: config
configMap:
name: "{{ include "outpost.fullname" . }}"
{{- with .Values.outpost.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
---
apiVersion: apps/v1
kind: Deployment
Expand All @@ -67,28 +121,86 @@ spec:
labels:
app: outpost-delivery
{{- include "outpost.labels" . | nindent 8 }}
{{- with .Values.outpost.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.outpost.serviceAccountName }}
serviceAccountName: {{ . }}
{{- end }}
{{- with .Values.outpost.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ include "outpost.name" . }}-delivery
image: {{ .Values.outpost.image.repository }}:{{ .Values.outpost.image.tag }}
imagePullPolicy: {{ .Values.outpost.image.pullPolicy }}
{{- with .Values.outpost.securityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.outpost.resources.delivery }}
resources:
{{- toYaml .Values.outpost.resources.delivery | nindent 12 }}
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
containerPort: 3333
protocol: TCP
livenessProbe:
httpGet:
path: /api/v1/healthz
port: http
initialDelaySeconds: 10
periodSeconds: 30
readinessProbe:
httpGet:
path: /api/v1/healthz
port: http
initialDelaySeconds: 5
periodSeconds: 10
volumeMounts:
- name: config
mountPath: /config/outpost
{{- with .Values.outpost.extraVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
env:
- name: SERVICE
value: delivery
{{- include "outpost.env" . | nindent 12 }}
{{- with .Values.outpost.envFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.outpost.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: config
configMap:
name: "{{ include "outpost.fullname" . }}"
{{- with .Values.outpost.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
---
apiVersion: apps/v1
kind: Deployment
Expand All @@ -107,25 +219,83 @@ spec:
labels:
app: outpost-log
{{- include "outpost.labels" . | nindent 8 }}
{{- with .Values.outpost.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.outpost.serviceAccountName }}
serviceAccountName: {{ . }}
{{- end }}
{{- with .Values.outpost.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ include "outpost.name" . }}-log
image: {{ .Values.outpost.image.repository }}:{{ .Values.outpost.image.tag }}
imagePullPolicy: {{ .Values.outpost.image.pullPolicy }}
{{- with .Values.outpost.securityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.outpost.resources.log }}
resources:
{{- toYaml .Values.outpost.resources.log | nindent 12 }}
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
containerPort: 3333
protocol: TCP
livenessProbe:
httpGet:
path: /api/v1/healthz
port: http
initialDelaySeconds: 10
periodSeconds: 30
readinessProbe:
httpGet:
path: /api/v1/healthz
port: http
initialDelaySeconds: 5
periodSeconds: 10
volumeMounts:
- name: config
mountPath: /config/outpost
{{- with .Values.outpost.extraVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
env:
- name: SERVICE
value: log
{{- include "outpost.env" . | nindent 12 }}
{{- with .Values.outpost.envFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.outpost.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.outpost.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- name: config
configMap:
name: "{{ include "outpost.fullname" . }}"
name: "{{ include "outpost.fullname" . }}"
{{- with .Values.outpost.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
34 changes: 33 additions & 1 deletion deployments/kubernetes/charts/outpost/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,38 @@ outpost:
delivery: 1 # Default to 1, scale based on queue size
log: 1 # Default to 1, scale based on log volume

# ServiceAccount to use for pods
serviceAccountName: ""

# Security contexts
podSecurityContext: {}
securityContext: {}

# Container resources (optional)
resources: {}

# Extra labels added to pod templates
podLabels: {}

# Annotations added to pod templates
podAnnotations: {}

# Pod scheduling constraints
nodeSelector: {}
affinity: {}
tolerations: []

# Additional volumes and mounts
extraVolumes: []
extraVolumeMounts: []

# Environment variables from Secrets/ConfigMaps
envFrom: []
# - secretRef:
# name: my-secret
# - configMapRef:
# name: my-configmap

service:
type: ClusterIP
port: 3333
Expand All @@ -23,7 +55,7 @@ outpost:
config: {}

ingress:
enabled: true
enabled: false
className: nginx
annotations: {}
hosts:
Expand Down
Loading