diff --git a/apis/installer/v1alpha1/inbox_server_types.go b/apis/installer/v1alpha1/inbox_server_types.go index 7b3ab33..4a5e9e8 100644 --- a/apis/installer/v1alpha1/inbox_server_types.go +++ b/apis/installer/v1alpha1/inbox_server_types.go @@ -77,6 +77,7 @@ type InboxServerSpec struct { } type DnsSpec struct { + Domain string `json:"domain"` EmailDomain string `json:"emailDomain"` TargetIPs []string `json:"targetIPs"` } diff --git a/charts/inbox-server/README.md b/charts/inbox-server/README.md index 4120293..d3df7b3 100644 --- a/charts/inbox-server/README.md +++ b/charts/inbox-server/README.md @@ -47,7 +47,8 @@ The following table lists the configurable parameters of the `inbox-server` char | Parameter | Description | Default | |-------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------| -| dns.emailDomain | # Default domain for all emailing components jmapUrl: "jmap.example.com" adminUrl: "admin.example.com" smtpHostname: "smtp.example.com" | "example.com" | +| dns.domain | # Default domain for all emailing components jmapUrl: "jmap.example.com" adminUrl: "admin.example.com" smtpHostname: "smtp.example.com" | "example.com" | +| dns.emailDomain | in ip mode, the emailDomain is ace.internal, otherwise same as domain | "example.com" | | dns.targetIPs | | [] | | james.replicaJmapInstanceCount | | 1 | | james.replicaImapSmtpInstanceCount | | 1 | @@ -132,7 +133,7 @@ The following table lists the configurable parameters of the `inbox-server` char Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: ```bash -$ helm upgrade -i inbox-server appscode/inbox-server -n monitoring --create-namespace --version=v2024.5.3 --set dns.emailDomain="example.com" +$ helm upgrade -i inbox-server appscode/inbox-server -n monitoring --create-namespace --version=v2024.5.3 --set dns.domain="example.com" ``` Alternatively, a YAML file that specifies the values for the parameters can be provided while diff --git a/charts/inbox-server/templates/james/james-admin-ingress.yaml b/charts/inbox-server/templates/james/james-admin-ingress.yaml index 798feb0..a74eb53 100644 --- a/charts/inbox-server/templates/james/james-admin-ingress.yaml +++ b/charts/inbox-server/templates/james/james-admin-ingress.yaml @@ -2,23 +2,13 @@ {{- $fullName := printf "%s-admin" (include "inbox-server.fullname" .) -}} {{- $svcPort := 8000 -}} -{{- if and .Values.adminIngress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.adminIngress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.adminIngress.annotations "kubernetes.io/ingress.class" .Values.adminIngress.className}} - {{- end }} -{{- end }} - {{- if and (not (hasKey .Values.adminIngress.annotations "external-dns.alpha.kubernetes.io/target")) .Values.dns.targetIPs }} {{- $_ := set .Values.adminIngress.annotations "external-dns.alpha.kubernetes.io/target" (join "," .Values.dns.targetIPs)}} {{- end }} +{{- $_ := set .Values.ingress.annotations "nginx.ingress.kubernetes.io/use-regex" "true" }} +{{- $_ := set .Values.ingress.annotations "nginx.ingress.kubernetes.io/rewrite-target" "/$2" }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} kind: Ingress metadata: name: {{ $fullName }} @@ -30,31 +20,24 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.adminIngress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + {{- if .Values.adminIngress.className }} ingressClassName: {{ .Values.adminIngress.className }} {{- end }} {{- if .Values.adminIngress.tls }} tls: - hosts: - - inbox-admin.{{ .Values.dns.emailDomain }} + - {{ .Values.dns.domain }} {{- toYaml .Values.adminIngress.tls | nindent 4 }} {{- end }} rules: - - host: inbox-admin.{{ .Values.dns.emailDomain }} + - host: {{ .Values.dns.domain }} http: paths: - - path: / - {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} - pathType: Prefix - {{- end }} + - path: /inbox-admin(/|$)(.*) + pathType: ImplementationSpecific backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} {{- end }} diff --git a/charts/inbox-server/templates/james/jmap-ingress.yaml b/charts/inbox-server/templates/james/jmap-ingress.yaml index 49acc95..96e7576 100644 --- a/charts/inbox-server/templates/james/jmap-ingress.yaml +++ b/charts/inbox-server/templates/james/jmap-ingress.yaml @@ -2,23 +2,13 @@ {{- $fullName := printf "%s-jmap" (include "inbox-server.fullname" .) -}} {{- $svcPort := 80 -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} - {{- if and (not (hasKey .Values.ingress.annotations "external-dns.alpha.kubernetes.io/target")) .Values.dns.targetIPs }} {{- $_ := set .Values.ingress.annotations "external-dns.alpha.kubernetes.io/target" (join "," .Values.dns.targetIPs)}} {{- end }} +{{- $_ := set .Values.ingress.annotations "nginx.ingress.kubernetes.io/use-regex" "true" }} +{{- $_ := set .Values.ingress.annotations "nginx.ingress.kubernetes.io/rewrite-target" "/$2" }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} kind: Ingress metadata: name: {{ $fullName }} @@ -30,31 +20,24 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + {{- if .Values.ingress.className }} ingressClassName: {{ .Values.ingress.className }} {{- end }} {{- if .Values.ingress.tls }} tls: - hosts: - - jmap.{{ .Values.dns.emailDomain }} + - {{ .Values.dns.domain }} {{- toYaml .Values.ingress.tls | nindent 4 }} {{- end }} rules: - - host: jmap.{{ .Values.dns.emailDomain }} + - host: {{ .Values.dns.domain }} http: paths: - - path: / - {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} - pathType: Prefix - {{- end }} + - path: /jmap(/|$)(.*) + pathType: ImplementationSpecific backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} {{- end }} diff --git a/charts/inbox-server/values.openapiv3_schema.yaml b/charts/inbox-server/values.openapiv3_schema.yaml index b8d69a7..1ee344b 100644 --- a/charts/inbox-server/values.openapiv3_schema.yaml +++ b/charts/inbox-server/values.openapiv3_schema.yaml @@ -1065,6 +1065,8 @@ properties: type: object dns: properties: + domain: + type: string emailDomain: type: string targetIPs: @@ -1072,6 +1074,7 @@ properties: type: string type: array required: + - domain - emailDomain - targetIPs type: object diff --git a/charts/inbox-server/values.yaml b/charts/inbox-server/values.yaml index 5c2e495..f9bcd6c 100644 --- a/charts/inbox-server/values.yaml +++ b/charts/inbox-server/values.yaml @@ -3,6 +3,8 @@ dns: # jmapUrl: "jmap.example.com" # adminUrl: "admin.example.com" # smtpHostname: "smtp.example.com" + domain: "example.com" + # in ip mode, the emailDomain is ace.internal, otherwise same as domain emailDomain: "example.com" targetIPs: []