diff --git a/docker/kubernetes/dolphinscheduler/README.md b/docker/kubernetes/dolphinscheduler/README.md index 0a5efe31632c3cb676144be67fb67a5b4612c9b9..05bf24e89ac6462160f6e98d2362af5a5911d0e1 100644 --- a/docker/kubernetes/dolphinscheduler/README.md +++ b/docker/kubernetes/dolphinscheduler/README.md @@ -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 diff --git a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml index f4b4795c289991c6c68935fcb0ff9d5fc49c4bc8..f25a16a9e5b1fee65f6c2ee2c90e86b02d3fb5f6 100644 --- a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml @@ -69,7 +69,7 @@ spec: - "api-server" ports: - containerPort: 12345 - name: tcp-port + name: "api-port" env: - name: TZ value: {{ .Values.timezone }} diff --git a/docker/kubernetes/dolphinscheduler/templates/ingress.yaml b/docker/kubernetes/dolphinscheduler/templates/ingress.yaml index 6edc82b12a60f496221d42b705be805f4488c72a..329ba2c24cd09bfb5a20611adabbb39a5607fe3e 100644 --- a/docker/kubernetes/dolphinscheduler/templates/ingress.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/ingress.yaml @@ -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 }} \ No newline at end of file diff --git a/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml b/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml index 4d07ade242d827560ddadce18588eaf98672ca55..5daa7c47df9664578948d4961ae623d6fd1228be 100644 --- a/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-api.yaml @@ -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 }} diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml index 99979af9d4652379bbf1376ab9626ece7bcfbd91..b68dd65b5b974ca42877696cd3f55bb8c3221e28 100644 --- a/docker/kubernetes/dolphinscheduler/values.yaml +++ b/docker/kubernetes/dolphinscheduler/values.yaml @@ -390,9 +390,7 @@ api: ingress: enabled: false host: "dolphinscheduler.org" - path: "/" + path: "/dolphinscheduler" tls: enabled: false - hosts: - - "dolphinscheduler.org" secretName: "dolphinscheduler-tls" \ No newline at end of file