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
15 changes: 15 additions & 0 deletions helm/silo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,21 @@ helm upgrade --install silo ./helm/silo \

Additional trusted CAs can be supplied through `trustedCertsSecret`.

Set `useFQDN: true` to use the existing `clusterDomain` in peer and provisioning
hostnames. Certificates must cover `<fullname>.<namespace>.svc.<clusterDomain>`
and the distributed peers `<fullname>-<ordinal>.<fullname>-svc.<namespace>.svc.<clusterDomain>`.
Changing peer addresses requires coordinated restarts. Short names remain the
default for compatibility. Provisioning scripts retain their existing TLS behavior.

`startupProbe`, `readinessProbe`, and `livenessProbe` accept complete Kubernetes
probe specifications; empty maps omit them. For HTTP probes, use port `http`
and scheme `HTTP`, or port `https` and scheme `HTTPS` when TLS is enabled.
`terminationGracePeriodSeconds` sets the server Pod shutdown grace period.

Set `consoleService.enabled: false` to omit the Console Service (also disable
`consoleIngress`). Set `postJob.ttlSecondsAfterFinished` for Job cleanup. Both
timeout settings accept zero; null preserves the Kubernetes default.

## Existing Secrets and post-install resources

Set `existingSecret` to a Secret containing `rootUser` and `rootPassword`.
Expand Down
8 changes: 8 additions & 0 deletions helm/silo/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,11 @@ otherwise it generates a random value.
{{- include "silo.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" (include "silo.fullname" .) "Length" 40 "Key" "rootPassword") }}
{{- end }}
{{- end -}}

{{/* Internal API hostname, optionally qualified for certificate validation. */}}
{{- define "silo.serviceHost" -}}
{{- include "silo.fullname" . -}}
{{- if .Values.useFQDN -}}
{{- printf ".%s.svc.%s" .Release.Namespace (trimSuffix "." .Values.clusterDomain) -}}
{{- end -}}
{{- end -}}
3 changes: 3 additions & 0 deletions helm/silo/templates/console-ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{{- if and .Values.consoleIngress.enabled (not .Values.consoleService.enabled) }}
{{- fail "consoleIngress.enabled requires consoleService.enabled" }}
{{- end }}
{{- if .Values.consoleIngress.enabled -}}
{{- $fullName := printf "%s-console" (include "silo.fullname" .) -}}
{{- $servicePort := .Values.consoleService.port -}}
Expand Down
2 changes: 2 additions & 0 deletions helm/silo/templates/console-service.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.consoleService.enabled }}
{{ $scheme := .Values.tls.enabled | ternary "https" "http" }}
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -43,3 +44,4 @@ spec:
selector:
app: {{ template "silo.name" . }}
release: {{ .Release.Name }}
{{- end }}
12 changes: 12 additions & 0 deletions helm/silo/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ spec:
{{- toYaml .Values.podAnnotations | trimSuffix "\n" | nindent 8 }}
{{- end }}
spec:
{{- if ne .Values.terminationGracePeriodSeconds nil }}
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
{{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: "{{ .Values.priorityClassName }}"
{{- end }}
Expand All @@ -68,6 +71,15 @@ spec:
- "/bin/sh"
- "-ce"
- "/usr/bin/docker-entrypoint.sh silo server {{ $bucketRoot }} -S {{ .Values.certsPath }} --address :{{ .Values.minioAPIPort }} --console-address :{{ .Values.minioConsolePort }} {{- template "silo.extraArgs" . }}"
{{- with .Values.startupProbe }}
startupProbe: {{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.readinessProbe }}
readinessProbe: {{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.livenessProbe }}
livenessProbe: {{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
- name: silo-user
mountPath: "/tmp/credentials"
Expand Down
13 changes: 8 additions & 5 deletions helm/silo/templates/post-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if ne .Values.postJob.ttlSecondsAfterFinished nil }}
ttlSecondsAfterFinished: {{ .Values.postJob.ttlSecondsAfterFinished }}
{{- end }}
template:
metadata:
labels:
Expand Down Expand Up @@ -103,7 +106,7 @@ spec:
{{- end }}
env:
- name: MINIO_ENDPOINT
value: {{ template "silo.fullname" . }}
value: {{ include "silo.serviceHost" . | quote }}
- name: MINIO_PORT
value: {{ .Values.service.port | quote }}
volumeMounts:
Expand Down Expand Up @@ -137,7 +140,7 @@ spec:
{{- end }}
env:
- name: MINIO_ENDPOINT
value: {{ template "silo.fullname" . }}
value: {{ include "silo.serviceHost" . | quote }}
- name: MINIO_PORT
value: {{ .Values.service.port | quote }}
volumeMounts:
Expand Down Expand Up @@ -170,7 +173,7 @@ spec:
{{- end }}
env:
- name: MINIO_ENDPOINT
value: {{ template "silo.fullname" . }}
value: {{ include "silo.serviceHost" . | quote }}
- name: MINIO_PORT
value: {{ .Values.service.port | quote }}
volumeMounts:
Expand Down Expand Up @@ -203,7 +206,7 @@ spec:
{{- end }}
env:
- name: MINIO_ENDPOINT
value: {{ template "silo.fullname" . }}
value: {{ include "silo.serviceHost" . | quote }}
- name: MINIO_PORT
value: {{ .Values.service.port | quote }}
volumeMounts:
Expand Down Expand Up @@ -239,7 +242,7 @@ spec:
{{- end }}
env:
- name: MINIO_ENDPOINT
value: {{ template "silo.fullname" . }}
value: {{ include "silo.serviceHost" . | quote }}
- name: MINIO_PORT
value: {{ .Values.service.port | quote }}
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions helm/silo/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
secret:
name: {{ .Values.tls.certSecret }}
key: {{ .Values.tls.publicCrt }}
serverName: {{ template "silo.fullname" . }}
serverName: {{ include "silo.serviceHost" . }}
{{- else }}
- port: http
scheme: http
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
secret:
name: {{ .Values.tls.certSecret }}
key: {{ .Values.tls.publicCrt }}
serverName: {{ template "silo.fullname" . }}
serverName: {{ include "silo.serviceHost" . }}
{{- end }}
prober:
url: {{ template "silo.fullname" . }}.{{ .Release.Namespace }}:{{ .Values.service.port }}
Expand Down
14 changes: 13 additions & 1 deletion helm/silo/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ spec:
{{- toYaml .Values.podAnnotations | nindent 8 }}
{{- end }}
spec:
{{- if ne .Values.terminationGracePeriodSeconds nil }}
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
{{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: "{{ .Values.priorityClassName }}"
{{- end }}
Expand All @@ -95,8 +98,17 @@ spec:
command: [
"/bin/sh",
"-ce",
"/usr/bin/docker-entrypoint.sh silo server {{- range $i := until $poolCount }}{{ $factor := mul $i $nodeCount }}{{ $endIndex := add $factor $nodeCount }}{{ $beginIndex := mul $i $nodeCount }} {{ $scheme }}://{{ template `silo.fullname` $ }}-{{ `{` }}{{ $beginIndex }}...{{ sub $endIndex 1 }}{{ `}`}}.{{ template `silo.fullname` $ }}-svc.{{ $.Release.Namespace }}.svc{{if (gt $drivesPerNode 1)}}{{ $bucketRoot }}-{{ `{` }}0...{{ sub $drivesPerNode 1 }}{{ `}` }}{{ else }}{{ $bucketRoot }}{{end }}{{- end }} -S {{ .Values.certsPath }} --address :{{ .Values.minioAPIPort }} --console-address :{{ .Values.minioConsolePort }} {{- template `silo.extraArgs` . }}"
"/usr/bin/docker-entrypoint.sh silo server {{- range $i := until $poolCount }}{{ $factor := mul $i $nodeCount }}{{ $endIndex := add $factor $nodeCount }}{{ $beginIndex := mul $i $nodeCount }} {{ $scheme }}://{{ template `silo.fullname` $ }}-{{ `{` }}{{ $beginIndex }}...{{ sub $endIndex 1 }}{{ `}`}}.{{ template `silo.fullname` $ }}-svc.{{ $.Release.Namespace }}.svc{{ if $.Values.useFQDN }}.{{ trimSuffix `.` $.Values.clusterDomain }}:{{ $.Values.minioAPIPort }}{{ end }}{{if (gt $drivesPerNode 1)}}{{ $bucketRoot }}-{{ `{` }}0...{{ sub $drivesPerNode 1 }}{{ `}` }}{{ else }}{{ $bucketRoot }}{{end }}{{- end }} -S {{ .Values.certsPath }} --address :{{ .Values.minioAPIPort }} --console-address :{{ .Values.minioConsolePort }} {{- template `silo.extraArgs` . }}"
]
{{- with .Values.startupProbe }}
startupProbe: {{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.readinessProbe }}
readinessProbe: {{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.livenessProbe }}
livenessProbe: {{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
{{- if $penabled }}
{{- if (gt $drivesPerNode 1) }}
Expand Down
15 changes: 15 additions & 0 deletions helm/silo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ fullnameOverride: ""
##
clusterDomain: cluster.local

## Use full DNS names for peer and provisioning connections. Existing releases
## retain short names by default; coordinate peer restarts when enabling this.
useFQDN: false

## Set default Silo server image repository, tag, and pull policy.
##
image:
Expand Down Expand Up @@ -58,6 +62,14 @@ extraVolumeMounts: []
## Additional sidecar containers
extraContainers: []

## Optional Kubernetes probe specifications for the server container.
startupProbe: {}
readinessProbe: {}
livenessProbe: {}

## Server Pod shutdown grace period. Null uses the Kubernetes default.
terminationGracePeriodSeconds: null

## Internal port number for the Silo S3 API container.
## Change service.port to change external port number
minioAPIPort: "9000"
Expand Down Expand Up @@ -221,6 +233,7 @@ ingress:
# - chart-example.local

consoleService:
enabled: true
type: ClusterIP
clusterIP: ~
port: "9001"
Expand Down Expand Up @@ -503,6 +516,8 @@ customCommandJob:

## Merge jobs
postJob:
## Null disables TTL cleanup; zero requests immediate cleanup.
ttlSecondsAfterFinished: null
podAnnotations: {}
annotations: {}
securityContext:
Expand Down