Browse Source
Merge pull request #3399 from kaiwalyajoshi/kjoshi/init-container-support
feat: Add support for k8s Init-Containers.
pull/3402/head
Chris Lu
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
42 additions and
7 deletions
-
k8s/helm_charts2/templates/_helpers.tpl
-
k8s/helm_charts2/templates/filer-statefulset.yaml
-
k8s/helm_charts2/templates/master-statefulset.yaml
-
k8s/helm_charts2/templates/s3-deployment.yaml
-
k8s/helm_charts2/templates/volume-statefulset.yaml
-
k8s/helm_charts2/values.yaml
|
|
@ -174,3 +174,12 @@ Inject extra environment vars in the format key:value, if populated |
|
|
|
{{- end -}} |
|
|
|
{{- end -}} |
|
|
|
{{- end -}} |
|
|
|
|
|
|
|
{{/* check if any InitContainers exist for Volumes */}} |
|
|
|
{{- define "volume.initContainers_exists" -}} |
|
|
|
{{- if or (not (empty .Values.volume.dir_idx )) (not (empty .Values.volume.initContainers )) -}} |
|
|
|
{{- printf "true" -}} |
|
|
|
{{- else -}} |
|
|
|
{{- printf "false" -}} |
|
|
|
{{- end -}} |
|
|
|
{{- end -}} |
|
|
@ -52,6 +52,10 @@ spec: |
|
|
|
priorityClassName: {{ .Values.filer.priorityClassName | quote }} |
|
|
|
{{- end }} |
|
|
|
enableServiceLinks: false |
|
|
|
{{- if .Values.filer.initContainers }} |
|
|
|
initContainers: |
|
|
|
{{ tpl .Values.filer.initContainers . | nindent 8 | trim }} |
|
|
|
{{- end }} |
|
|
|
containers: |
|
|
|
- name: seaweedfs |
|
|
|
image: {{ template "filer.image" . }} |
|
|
|
|
|
@ -51,6 +51,10 @@ spec: |
|
|
|
priorityClassName: {{ .Values.master.priorityClassName | quote }} |
|
|
|
{{- end }} |
|
|
|
enableServiceLinks: false |
|
|
|
{{- if .Values.master.initContainers }} |
|
|
|
initContainers: |
|
|
|
{{ tpl .Values.master.initContainers . | nindent 8 | trim }} |
|
|
|
{{- end }} |
|
|
|
containers: |
|
|
|
- name: seaweedfs |
|
|
|
image: {{ template "master.image" . }} |
|
|
|
|
|
@ -39,6 +39,10 @@ spec: |
|
|
|
priorityClassName: {{ .Values.s3.priorityClassName | quote }} |
|
|
|
{{- end }} |
|
|
|
enableServiceLinks: false |
|
|
|
{{- if .Values.s3.initContainers }} |
|
|
|
initContainers: |
|
|
|
{{ tpl .Values.s3.initContainers . | nindent 8 | trim }} |
|
|
|
{{- end }} |
|
|
|
containers: |
|
|
|
- name: seaweedfs |
|
|
|
image: {{ template "s3.image" . }} |
|
|
|
|
|
@ -45,19 +45,25 @@ spec: |
|
|
|
priorityClassName: {{ .Values.volume.priorityClassName | quote }} |
|
|
|
{{- end }} |
|
|
|
enableServiceLinks: false |
|
|
|
{{- if .Values.volume.dir_idx }} |
|
|
|
{{- $initContainers_exists := include "volume.initContainers_exists" . -}} |
|
|
|
{{- if $initContainers_exists }} |
|
|
|
initContainers: |
|
|
|
{{- if .Values.volume.dir_idx }} |
|
|
|
- name: seaweedfs-vol-move-idx |
|
|
|
image: {{ template "volume.image" . }} |
|
|
|
imagePullPolicy: {{ .Values.global.pullPolicy | default "IfNotPresent" }} |
|
|
|
imagePullPolicy: {{ .Values.global.imagePullPolicy | default "IfNotPresent" }} |
|
|
|
command: [ '/bin/sh', '-c' ] |
|
|
|
args: ['if ls {{ .Values.volume.dir }}/*.idx >/dev/null 2>&1; then mv {{ .Values.volume.dir }}/*.idx {{ .Values.volume.dir_idx }}/; fi;'] |
|
|
|
args: [ 'if ls {{ .Values.volume.dir }}/*.idx >/dev/null 2>&1; then mv {{ .Values.volume.dir }}/*.idx {{ .Values.volume.dir_idx }}/; fi;' ] |
|
|
|
volumeMounts: |
|
|
|
- name: idx |
|
|
|
mountPath: {{ .Values.volume.dir_idx }} |
|
|
|
- name: data |
|
|
|
mountPath: {{ .Values.volume.dir }} |
|
|
|
{{- end }} |
|
|
|
{{- if .Values.volume.initContainers }} |
|
|
|
{{ tpl .Values.volume.initContainers . | nindent 8 | trim }} |
|
|
|
{{- end }} |
|
|
|
{{- end }} |
|
|
|
containers: |
|
|
|
- name: seaweedfs |
|
|
|
image: {{ template "volume.image" . }} |
|
|
|
|
|
@ -73,6 +73,8 @@ master: |
|
|
|
size: "" |
|
|
|
storageClass: "" |
|
|
|
|
|
|
|
initContainers: "" |
|
|
|
|
|
|
|
extraVolumes: "" |
|
|
|
extraVolumeMounts: "" |
|
|
|
|
|
|
@ -210,6 +212,8 @@ volume: |
|
|
|
# Adjust jpg orientation when uploading. |
|
|
|
imagesFixOrientation: false |
|
|
|
|
|
|
|
initContainers: "" |
|
|
|
|
|
|
|
extraVolumes: "" |
|
|
|
extraVolumeMounts: "" |
|
|
|
|
|
|
@ -309,6 +313,8 @@ filer: |
|
|
|
size: "" |
|
|
|
storageClass: "" |
|
|
|
|
|
|
|
initContainers: "" |
|
|
|
|
|
|
|
extraVolumes: "" |
|
|
|
extraVolumeMounts: "" |
|
|
|
|
|
|
@ -424,6 +430,8 @@ s3: |
|
|
|
# Suffix of the host name, {bucket}.{domainName} |
|
|
|
domainName: "" |
|
|
|
|
|
|
|
initContainers: "" |
|
|
|
|
|
|
|
extraVolumes: "" |
|
|
|
extraVolumeMounts: "" |
|
|
|
|
|
|
|