This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/branch-1.7 by this push:
new 5324ac1d0 [KYUUBI #4707] [K8S][HELM] Fix README typo and minor
reformatting
5324ac1d0 is described below
commit 5324ac1d06841279528e7301a316dac911564858
Author: dnskr <[email protected]>
AuthorDate: Fri Apr 14 11:59:31 2023 +0800
[KYUUBI #4707] [K8S][HELM] Fix README typo and minor reformatting
### _Why are the changes needed?_
The changes are needed to fix the link to Kyuubi web site and follow common
template formatting style.
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including
negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [ ] [Run
test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests)
locally before make a pull request
Closes #4707 from dnskr/fix_readme_typo_and_reformatting.
Closes #4707
cb5d24ace [dnskr] [K8S][HELM] Fix README typo and minor reformatting
Authored-by: dnskr <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
(cherry picked from commit c0e967f1c500bc46d7038fa4f453f735d39eab1c)
Signed-off-by: Cheng Pan <[email protected]>
---
charts/kyuubi/README.md | 2 +-
charts/kyuubi/templates/_helpers.tpl | 18 +++++++++---------
charts/kyuubi/templates/kyuubi-configmap.yaml | 2 +-
charts/kyuubi/templates/kyuubi-deployment.yaml | 4 +++-
charts/kyuubi/templates/kyuubi-service.yaml | 3 +--
5 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/charts/kyuubi/README.md b/charts/kyuubi/README.md
index ef54c3226..ad956a371 100644
--- a/charts/kyuubi/README.md
+++ b/charts/kyuubi/README.md
@@ -19,7 +19,7 @@
# Helm Chart for Apache Kyuubi
-[Apache Kyuubi](https://airflow.apache.org/) is a distributed and multi-tenant
gateway to provide serverless SQL on Data Warehouses and Lakehouses.
+[Apache Kyuubi](https://kyuubi.apache.org) is a distributed and multi-tenant
gateway to provide serverless SQL on Data Warehouses and Lakehouses.
## Introduction
diff --git a/charts/kyuubi/templates/_helpers.tpl
b/charts/kyuubi/templates/_helpers.tpl
index cd4865a12..07e66d5f1 100644
--- a/charts/kyuubi/templates/_helpers.tpl
+++ b/charts/kyuubi/templates/_helpers.tpl
@@ -20,14 +20,14 @@ A comma separated string of enabled frontend protocols,
e.g. "REST,THRIFT_BINARY
For details, see 'kyuubi.frontend.protocols':
https://kyuubi.readthedocs.io/en/master/deployment/settings.html#frontend
*/}}
{{- define "kyuubi.frontend.protocols" -}}
-{{- $protocols := list }}
-{{- range $name, $frontend := .Values.server }}
- {{- if $frontend.enabled }}
- {{- $protocols = $name | snakecase | upper | append $protocols }}
+ {{- $protocols := list }}
+ {{- range $name, $frontend := .Values.server }}
+ {{- if $frontend.enabled }}
+ {{- $protocols = $name | snakecase | upper | append $protocols }}
+ {{- end }}
{{- end }}
-{{- end }}
-{{- if not $protocols }}
- {{ fail "At least one frontend protocol must be enabled!" }}
-{{- end }}
-{{- $protocols | join "," }}
+ {{- if not $protocols }}
+ {{ fail "At least one frontend protocol must be enabled!" }}
+ {{- end }}
+ {{- $protocols | join "," }}
{{- end }}
diff --git a/charts/kyuubi/templates/kyuubi-configmap.yaml
b/charts/kyuubi/templates/kyuubi-configmap.yaml
index 4964e651c..596ec493e 100644
--- a/charts/kyuubi/templates/kyuubi-configmap.yaml
+++ b/charts/kyuubi/templates/kyuubi-configmap.yaml
@@ -43,7 +43,7 @@ data:
## User provided Kyuubi configurations
{{- with .Values.kyuubiConf.kyuubiDefaults }}
- {{- tpl . $ | nindent 4 }}
+ {{- tpl . $ | nindent 4 }}
{{- end }}
{{- with .Values.kyuubiConf.log4j2 }}
log4j2.xml: |
diff --git a/charts/kyuubi/templates/kyuubi-deployment.yaml
b/charts/kyuubi/templates/kyuubi-deployment.yaml
index 43899b6fc..52468df4e 100644
--- a/charts/kyuubi/templates/kyuubi-deployment.yaml
+++ b/charts/kyuubi/templates/kyuubi-deployment.yaml
@@ -42,7 +42,9 @@ spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets: {{- toYaml . | nindent 8 }}
{{- end }}
+ {{- if or .Values.serviceAccount.name .Values.serviceAccount.create }}
serviceAccountName: {{ .Values.serviceAccount.name | default
.Release.Name }}
+ {{- end }}
{{- with .Values.initContainers }}
initContainers: {{- tpl (toYaml .) $ | nindent 8 }}
{{- end }}
@@ -90,7 +92,7 @@ spec:
successThreshold: {{ .Values.probe.readiness.successThreshold }}
{{- end }}
{{- with .Values.resources }}
- resources: {{- toYaml . | nindent 12 }}
+ resources: {{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
- name: conf
diff --git a/charts/kyuubi/templates/kyuubi-service.yaml
b/charts/kyuubi/templates/kyuubi-service.yaml
index 963f1fcc7..3cea30b70 100644
--- a/charts/kyuubi/templates/kyuubi-service.yaml
+++ b/charts/kyuubi/templates/kyuubi-service.yaml
@@ -28,8 +28,7 @@ metadata:
app.kubernetes.io/version: {{ $.Values.image.tag | default
$.Chart.AppVersion | quote }}
app.kubernetes.io/managed-by: {{ $.Release.Service }}
{{- with $frontend.service.annotations }}
- annotations:
- {{- toYaml . | nindent 4 }}
+ annotations: {{- toYaml . | nindent 4 }}
{{- end }}
spec:
type: {{ $frontend.service.type }}
