natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Improvement][K8s] Optimize ingress compatibility

This commit is contained in:
chengshiwen 2021-02-28 12:08:44 +08:00
parent bfc5d1e4ba
commit 79b5f8c791
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/kubernetes/dolphinscheduler/README.md
View File

@ -253,9 +253,8 @@ The Configuration file is `values.yaml`, and the following tables lists the conf
| | | |
| `ingress.enabled` | Enable ingress | `false` |
| `ingress.host` | Ingress host | `dolphinscheduler.org` |
| `ingress.path` | Ingress path | `/` |
| `ingress.path` | Ingress path | `/dolphinscheduler` |
| `ingress.tls.enabled` | Enable ingress tls | `false` |
| `ingress.tls.hosts` | Ingress tls hosts | `dolphinscheduler.org` |
| `ingress.tls.secretName` | Ingress tls secret name | `dolphinscheduler-tls` |
## FAQ

2
docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml
View File

@ -69,7 +69,7 @@ spec:
- "api-server"
ports:
- containerPort: 12345
name: tcp-port
name: "api-port"
env:
- name: TZ
value: {{ .Values.timezone }}

22
docker/kubernetes/dolphinscheduler/templates/ingress.yaml
View File

@ -15,7 +15,13 @@
# limitations under the License.
#
{{- if .Values.ingress.enabled }}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
apiVersion: networking.k8s.io/v1
{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}
apiVersion: networking.k8s.io/v1beta1
{{- else }}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ include "dolphinscheduler.fullname" . }}
@ -30,14 +36,22 @@ spec:
paths:
- path: {{ .Values.ingress.path }}
backend:
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
service:
name: {{ include "dolphinscheduler.fullname" . }}-api
port:
name: api-port
{{- else }}
serviceName: {{ include "dolphinscheduler.fullname" . }}-api
servicePort: tcp-port
servicePort: api-port
{{- end }}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
pathType: Prefix
{{- end }}
{{- if .Values.ingress.tls.enabled }}
tls:
hosts:
{{- range .Values.ingress.tls.hosts }}
- {{ . | quote }}
{{- end }}
- {{ .Values.ingress.host }}
secretName: {{ .Values.ingress.tls.secretName }}
{{- end }}
{{- end }}

4
docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml
View File

@ -25,9 +25,9 @@ metadata:
spec:
ports:
- port: 12345
targetPort: tcp-port
targetPort: api-port
protocol: TCP
name: tcp-port
name: api-port
selector:
app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }}-api
app.kubernetes.io/instance: {{ .Release.Name }}

4
docker/kubernetes/dolphinscheduler/values.yaml
View File

@ -390,9 +390,7 @@ api:
ingress:
enabled: false
host: "dolphinscheduler.org"
path: "/"
path: "/dolphinscheduler"
tls:
enabled: false
hosts:
- "dolphinscheduler.org"
secretName: "dolphinscheduler-tls"