From 167a768b3264808d2a9ee6829df0ae0a141b3603 Mon Sep 17 00:00:00 2001 From: chengshiwen Date: Mon, 8 Mar 2021 16:48:44 +0800 Subject: [PATCH] [Improvement][K8s] Optimize fullname --- docker/kubernetes/dolphinscheduler/README.md | 3 +- .../dolphinscheduler/templates/_helpers.tpl | 53 ++----------------- .../dolphinscheduler/templates/ingress.yaml | 2 +- .../kubernetes/dolphinscheduler/values.yaml | 5 +- 4 files changed, 8 insertions(+), 55 deletions(-) diff --git a/docker/kubernetes/dolphinscheduler/README.md b/docker/kubernetes/dolphinscheduler/README.md index 3bee7bd13d..3c15044fb5 100644 --- a/docker/kubernetes/dolphinscheduler/README.md +++ b/docker/kubernetes/dolphinscheduler/README.md @@ -78,8 +78,7 @@ The Configuration file is `values.yaml`, and the following tables lists the conf | Parameter | Description | Default | | --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------- | -| `nameOverride` | String to partially override common.names.fullname | `nil` | -| `fullnameOverride` | String to fully override common.names.fullname | `nil` | +| `fullname` | Fullname for DolphinScheduler to override the default release name | `nil` | | `timezone` | World time and date for cities in all time zones | `Asia/Shanghai` | | `image.repository` | Docker image repository for the DolphinScheduler | `apache/dolphinscheduler` | | `image.tag` | Docker image version for the DolphinScheduler | `latest` | diff --git a/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl b/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl index 0b3132c502..7fe5b68567 100644 --- a/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl +++ b/docker/kubernetes/dolphinscheduler/templates/_helpers.tpl @@ -16,12 +16,6 @@ # {{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "dolphinscheduler.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} {{/* Create a default fully qualified app name. @@ -29,53 +23,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this If release name contains chart name it will be used as a full name. */}} {{- define "dolphinscheduler.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- if .Values.fullname -}} +{{- .Values.fullname | trunc 63 | trimSuffix "-" -}} {{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} +{{- if contains .Chart.Name .Release.Name -}} {{- .Release.Name | trunc 63 | trimSuffix "-" -}} {{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "dolphinscheduler.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "dolphinscheduler.labels" -}} -helm.sh/chart: {{ include "dolphinscheduler.chart" . }} -{{ include "dolphinscheduler.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- printf "%s-%s" .Release.Name .Chart.Name | trunc 63 | trimSuffix "-" -}} {{- end -}} - -{{/* -Selector labels -*/}} -{{- define "dolphinscheduler.selectorLabels" -}} -app.kubernetes.io/name: {{ include "dolphinscheduler.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "dolphinscheduler.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "dolphinscheduler.fullname" .) .Values.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} diff --git a/docker/kubernetes/dolphinscheduler/templates/ingress.yaml b/docker/kubernetes/dolphinscheduler/templates/ingress.yaml index 329ba2c24c..4f76f2b304 100644 --- a/docker/kubernetes/dolphinscheduler/templates/ingress.yaml +++ b/docker/kubernetes/dolphinscheduler/templates/ingress.yaml @@ -26,7 +26,7 @@ kind: Ingress metadata: name: {{ include "dolphinscheduler.fullname" . }} labels: - app.kubernetes.io/name: {{ include "dolphinscheduler.name" . }} + app.kubernetes.io/name: {{ include "dolphinscheduler.fullname" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} spec: diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml index 6036d2d647..24b5759281 100644 --- a/docker/kubernetes/dolphinscheduler/values.yaml +++ b/docker/kubernetes/dolphinscheduler/values.yaml @@ -19,9 +19,8 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -nameOverride: "" -fullnameOverride: "" - +## Fullname for Dolphinscheduler, by default, the release name is used +fullname: "" timezone: "Asia/Shanghai" image: