diff --git a/kubernetes/apps/default/mailrise/app/helmrelease.yaml b/kubernetes/apps/default/mailrise/app/helmrelease.yaml index 86bdc01c0..3761e7fe7 100644 --- a/kubernetes/apps/default/mailrise/app/helmrelease.yaml +++ b/kubernetes/apps/default/mailrise/app/helmrelease.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: app-template - version: 1.5.1 + version: 2.0.3 sourceRef: kind: HelmRepository name: bjw-s @@ -27,19 +27,36 @@ spec: uninstall: keepHistory: false values: - controller: - replicas: 1 - strategy: RollingUpdate - annotations: - reloader.stakater.com/auto: "true" - image: - repository: docker.io/yoryan/mailrise - tag: 1.4.0 - env: - TZ: ${TIMEZONE} - envFrom: - - secretRef: - name: mailrise-secret + defaultPodOptions: + topologySpreadConstraints: + - maxSkew: 1 + topologyKey: kubernetes.io/hostname + whenUnsatisfiable: DoNotSchedule + labelSelector: + matchLabels: + app.kubernetes.io/name: *app + controllers: + main: + replicas: 2 + strategy: RollingUpdate + annotations: + reloader.stakater.com/auto: "true" + containers: + main: + image: + repository: docker.io/yoryan/mailrise + tag: 1.4.0 + env: + TZ: ${TIMEZONE} + envFrom: + - secretRef: + name: mailrise-secret + resources: + requests: + cpu: 10m + memory: 10Mi + limits: + memory: 200Mi service: main: type: LoadBalancer @@ -51,14 +68,16 @@ spec: ingress: main: enabled: true - ingressClassName: nginx + className: nginx annotations: hajimari.io/enable: "false" hosts: - host: &host "{{ .Release.Name }}.${SECRET_CLUSTER_DOMAIN}" paths: - path: / - pathType: Prefix + service: + name: main + port: http tls: - hosts: - *host @@ -67,19 +86,7 @@ spec: enabled: true type: configMap name: mailrise-configmap - subPath: mailrise.conf - mountPath: /etc/mailrise.conf - readOnly: true - topologySpreadConstraints: - - maxSkew: 1 - topologyKey: kubernetes.io/hostname - whenUnsatisfiable: DoNotSchedule - labelSelector: - matchLabels: - app.kubernetes.io/name: *app - resources: - requests: - cpu: 10m - memory: 10Mi - limits: - memory: 200Mi + globalMounts: + - path: /etc/mailrise.conf + subPath: mailrise.conf + readOnly: true