diff --git a/loop-enterprise-edition/Chart.yaml b/loop-enterprise-edition/Chart.yaml index 3602b4a..1ce29d6 100644 --- a/loop-enterprise-edition/Chart.yaml +++ b/loop-enterprise-edition/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 9.11.1 +appVersion: 10.0.1 description: LOOP Enterprise server with high availability. home: https://loop.ru icon: https://artifacts.wilix.dev/repository/loop-files/assets/loop-icon.png diff --git a/loop-enterprise-edition/templates/deployment-jobserver.yaml b/loop-enterprise-edition/templates/deployment-jobserver.yaml new file mode 100644 index 0000000..e39b6a0 --- /dev/null +++ b/loop-enterprise-edition/templates/deployment-jobserver.yaml @@ -0,0 +1,58 @@ +{{- if .Values.jobserver.enabled -}} +apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} +kind: Deployment +metadata: + name: {{ include "common.names.fullname" . }}-jobserver + labels: + app.kubernetes.io/name: {{ include "common.names.fullname" . }}-jobserver +spec: + replicas: 1 + strategy: {} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "common.names.fullname" . }}-jobserver + template: + metadata: + {{- if or .Values.checksums}} + annotations: + {{- range .Values.checksums }} + checksum/{{ . | trimPrefix "/" }}: {{ include (print $.Template.BasePath "/" (. | trimPrefix "/")) $ | sha256sum }} + {{- end }} + {{- end }} + labels: + app.kubernetes.io/name: {{ include "common.names.fullname" . }}-jobserver + spec: + affinity: {} + nodeSelector: {} + tolerations: {} + schedulerName: {} + securityContext: {} + containers: + - name: app-jobserver + image: {{ include "app.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + command: ["mattermost", "jobserver"] + {{- if .Values.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.env }} + env: + {{- include "common.tplvalues.render" (dict "value" .Values.env "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.envFrom }} + envFrom: {{- include "common.tplvalues.render" (dict "value" .Values.envFrom "context" $) | nindent 12 }} + {{- end }} + resources: {{- include "common.tplvalues.render" (dict "value" .Values.resources "context" $) | nindent 12 }} + volumeMounts: + {{- if .Values.volumeMounts }} + {{- include "common.tplvalues.render" (dict "value" .Values.volumeMounts "context" $) | nindent 12 }} + {{- end }} + + volumes: + {{- if .Values.volumes }} + {{- include "common.tplvalues.render" (dict "value" .Values.volumes "context" $) | nindent 8 }} + {{- end }} +{{- end }} diff --git a/loop-enterprise-edition/templates/deployment.yaml b/loop-enterprise-edition/templates/deployment.yaml index 6bd9a41..3a6b5b0 100644 --- a/loop-enterprise-edition/templates/deployment.yaml +++ b/loop-enterprise-edition/templates/deployment.yaml @@ -92,6 +92,13 @@ spec: {{- if .Values.envFrom }} envFrom: {{- include "common.tplvalues.render" (dict "value" .Values.envFrom "context" $) | nindent 12 }} {{- end }} + {{- if .Values.jobserver.enabled }} + env: + - name: MM_JOBSETTINGS_RUNJOBS + value: "false" + - name: MM_JOBSETTINGS_RUNSCHEDULER + value: "false" + {{- end }} {{- if .Values.containerPorts }} ports: {{ .Values.containerPorts | toYaml | nindent 12 }} {{- end }} diff --git a/loop-enterprise-edition/values.yaml b/loop-enterprise-edition/values.yaml index 2537a02..e006ccb 100644 --- a/loop-enterprise-edition/values.yaml +++ b/loop-enterprise-edition/values.yaml @@ -1,7 +1,7 @@ image: registry: registry.loop.ru repository: loop/server - tag: 2025-11-20-1 + tag: 10.0.1 pullPolicy: IfNotPresent # pullSecrets: # - myRegistryKeySecretName @@ -241,9 +241,6 @@ configMaps: MM_FILESETTINGS_AMAZONS3SSL: "false" #Параметр указывает, должно ли подключение к Amazon S3 осуществляться через SSL MM_FILESETTINGS_DRIVERNAME: "amazons3" #Имя драйвера для работы с файлами MM_FILESETTINGS_MAXFILESIZE: "1048576000" #Максимальный размер файла для загрузки, указан в байтах - ## Default: true MM_JOBSETTINGS_* - # MM_JOBSETTINGS_RUNJOBS: "false" #Указывает, должны ли выполняться задания - # MM_JOBSETTINGS_RUNSCHEDULER: "false" #Флаг указывает, должен ли быть запущен планировщик задач MM_LOGSETTINGS_CONSOLEJSON: "false" #Флаг указывает, должен ли вывод в консоль быть в формате JSON MM_LOGSETTINGS_CONSOLELEVEL: "DEBUG" #Уровень логирования для вывода в консоль MM_LOGSETTINGS_FILELEVEL: "DEBUG" #Уровень логирования для записи в файл @@ -288,3 +285,6 @@ configMaps: # MM_CLUSTERSETTINGS_ENABLEEXPERIMENTALGOSSIPENCRYPTION: "true" # MM_CLUSTERSETTINGS_ENABLEGOSSIPCOMPRESSION: "false" # MM_CLUSTERSETTINGS_READONLYCONFIG: "false" + +jobserver: + enabled: false diff --git a/loop-enterprise-stack/Chart.yaml b/loop-enterprise-stack/Chart.yaml index e1d1f16..b8bfaff 100644 --- a/loop-enterprise-stack/Chart.yaml +++ b/loop-enterprise-stack/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 9.11.1 +appVersion: 10.0.1 dependencies: - name: loop-enterprise-edition repository: https://artifacts.wilix.dev/repository/helm-loop diff --git a/loop-enterprise-stack/values.yaml b/loop-enterprise-stack/values.yaml index 49dd6d7..1db913d 100644 --- a/loop-enterprise-stack/values.yaml +++ b/loop-enterprise-stack/values.yaml @@ -4,7 +4,7 @@ loop-enterprise-edition: image: registry: registry.loop.ru repository: loop/server - tag: 2025-11-20-1 + tag: 10.0.1 pullPolicy: IfNotPresent name: loop-server @@ -119,9 +119,6 @@ loop-enterprise-edition: MM_FILESETTINGS_AMAZONS3SSL: "false" #Параметр указывает, должно ли подключение к Amazon S3 осуществляться через SSL MM_FILESETTINGS_DRIVERNAME: "amazons3" #Имя драйвера для работы с файлами MM_FILESETTINGS_MAXFILESIZE: "1048576000" #Максимальный размер файла для загрузки, указан в байтах - ## Default: true MM_JOBSETTINGS_* - # MM_JOBSETTINGS_RUNJOBS: "false" #Указывает, должны ли выполняться задания - # MM_JOBSETTINGS_RUNSCHEDULER: "false" #Флаг указывает, должен ли быть запущен планировщик задач MM_LOGSETTINGS_CONSOLEJSON: "false" #Флаг указывает, должен ли вывод в консоль быть в формате JSON MM_LOGSETTINGS_CONSOLELEVEL: "DEBUG" #Уровень логирования для вывода в консоль MM_LOGSETTINGS_FILELEVEL: "DEBUG" #Уровень логирования для записи в файл @@ -167,6 +164,10 @@ loop-enterprise-edition: # MM_CLUSTERSETTINGS_ENABLEGOSSIPCOMPRESSION: "false" # MM_CLUSTERSETTINGS_READONLYCONFIG: "false" + jobserver: + enabled: false + + # Postgresql Section. Use this to configure postgresql. # If you want to use an external database, disable this. postgresql: