diff --git a/docker/kubernetes/dolphinscheduler/README.md b/docker/kubernetes/dolphinscheduler/README.md index 57e41a0b97..29607ed823 100644 --- a/docker/kubernetes/dolphinscheduler/README.md +++ b/docker/kubernetes/dolphinscheduler/README.md @@ -81,7 +81,6 @@ The Configuration file is `values.yaml`, and the following tables lists the conf | `nameOverride` | String to partially override common.names.fullname | `nil` | | `fullnameOverride` | String to fully override common.names.fullname | `nil` | | `timezone` | World time and date for cities in all time zones | `Asia/Shanghai` | -| `image.registry` | Docker image registry for the DolphinScheduler | `docker.io` | | `image.repository` | Docker image repository for the DolphinScheduler | `apache/dolphinscheduler` | | `image.tag` | Docker image version for the DolphinScheduler | `latest` | | `image.pullPolicy` | Image pull policy. One of Always, Never, IfNotPresent | `IfNotPresent` | @@ -283,7 +282,7 @@ docker build -t apache/dolphinscheduler:mysql . 4. Push the docker image `apache/dolphinscheduler:mysql` to a docker registry -5. Modify image `registry` and `repository`, and update `tag` to `mysql` in `values.yaml` +5. Modify image `repository` and update `tag` to `mysql` in `values.yaml` 6. Modify postgresql `enabled` to `false` @@ -326,7 +325,7 @@ docker build -t apache/dolphinscheduler:mysql-driver . 4. Push the docker image `apache/dolphinscheduler:mysql-driver` to a docker registry -5. Modify image `registry` and `repository`, and update `tag` to `mysql-driver` in `values.yaml` +5. Modify image `repository` and update `tag` to `mysql-driver` in `values.yaml` 6. Run a DolphinScheduler release in Kubernetes (See **Installing the Chart**) @@ -355,7 +354,7 @@ docker build -t apache/dolphinscheduler:oracle-driver . 4. Push the docker image `apache/dolphinscheduler:oracle-driver` to a docker registry -5. Modify image `registry` and `repository`, and update `tag` to `oracle-driver` in `values.yaml` +5. Modify image `repository` and update `tag` to `oracle-driver` in `values.yaml` 6. Run a DolphinScheduler release in Kubernetes (See **Installing the Chart**) diff --git a/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl b/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl index 542bcb2f66..80f52dea0b 100644 --- a/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl +++ b/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl @@ -80,25 +80,14 @@ Create the name of the service account to use {{- end -}} {{/* -Create a default docker image registry. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -*/}} -{{- define "dolphinscheduler.image.registry" -}} -{{- $registry := default "docker.io" .Values.image.registry -}} -{{- printf "%s" $registry | trunc 63 | trimSuffix "/" -}} -{{- end -}} - -{{/* -Create a default docker image repository. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +Create a default docker image fullname. */}} -{{- define "dolphinscheduler.image.repository" -}} -{{- printf "%s/%s:%s" (include "dolphinscheduler.image.registry" .) .Values.image.repository .Values.image.tag -}} +{{- define "dolphinscheduler.image.fullname" -}} +{{- printf "%s:%s" .Values.image.repository .Values.image.tag -}} {{- end -}} {{/* Create a default image pull secrects. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "dolphinscheduler.image.pullSecrets" -}} {{- default nil .Values.image.pullSecrets -}} @@ -124,9 +113,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{/* Create a default fully qualified zookkeeper quorum. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "dolphinscheduler.zookeeper.quorum" -}} {{- $port := default "2181" (.Values.zookeeper.service.port | toString) -}} -{{- printf "%s:%s" (include "dolphinscheduler.zookeeper.fullname" .) $port | trunc 63 | trimSuffix "-" -}} +{{- printf "%s:%s" (include "dolphinscheduler.zookeeper.fullname" .) $port -}} {{- end -}} \ No newline at end of file diff --git a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml index f66427e470..9de73bb0c1 100644 --- a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-alert.yaml @@ -63,7 +63,7 @@ spec: {{- end }} containers: - name: {{ include "dolphinscheduler.fullname" . }}-alert - image: {{ include "dolphinscheduler.image.repository" . | quote }} + image: {{ include "dolphinscheduler.image.fullname" . | quote }} imagePullPolicy: {{ .Values.image.pullPolicy }} args: - "alert-server" diff --git a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml index 475c7867f3..65e91eeef9 100644 --- a/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-api.yaml @@ -63,7 +63,7 @@ spec: {{- end }} containers: - name: {{ include "dolphinscheduler.fullname" . }}-api - image: {{ include "dolphinscheduler.image.repository" . | quote }} + image: {{ include "dolphinscheduler.image.fullname" . | quote }} imagePullPolicy: {{ .Values.image.pullPolicy }} args: - "api-server" diff --git a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml index 55d13d73ad..ab65c7c916 100644 --- a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-master.yaml @@ -60,7 +60,7 @@ spec: {{- end }} containers: - name: {{ include "dolphinscheduler.fullname" . }}-master - image: {{ include "dolphinscheduler.image.repository" . | quote }} + image: {{ include "dolphinscheduler.image.fullname" . | quote }} imagePullPolicy: {{ .Values.image.pullPolicy }} args: - "master-server" diff --git a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml index 0b12ed714d..5b0268cb43 100644 --- a/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml @@ -60,7 +60,7 @@ spec: {{- end }} containers: - name: {{ include "dolphinscheduler.fullname" . }}-worker - image: {{ include "dolphinscheduler.image.repository" . | quote }} + image: {{ include "dolphinscheduler.image.fullname" . | quote }} imagePullPolicy: {{ .Values.image.pullPolicy }} args: - "worker-server" diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml index 071e7fb2bd..9b732e11a5 100644 --- a/docker/kubernetes/dolphinscheduler/values.yaml +++ b/docker/kubernetes/dolphinscheduler/values.yaml @@ -25,7 +25,6 @@ fullnameOverride: "" timezone: "Asia/Shanghai" image: - registry: "docker.io" repository: "apache/dolphinscheduler" tag: "latest" pullPolicy: "IfNotPresent"