charts: resolve the code conflicts radondb#75

zhyass · Apr 27, 2021 · 1db0cdd · 1db0cdd
1 parent e2ddd03
commit 1db0cdd
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 28 deletions.
diff --git a/charts/Chart.yaml b/charts/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
-name: xenondb
-description: XenonDB is a High-Availability MySQL cluster, open source.
-home: https://github.com/radondb/xenondb.git
+name: radondb-mysql
+description: RadonDB MySQL is a High-Availability MySQL cluster, open source.
+home: https://github.com/radondb/radondb-mysql-kubernetes.git
 
 # A chart can be either an 'application' or a 'library' chart.
 #

diff --git a/charts/README.md b/charts/README.md
@@ -1,11 +1,13 @@
 # RadonDB MySQL
-RadonDB MySQL is a open-source, cloud-native, High-Availability cluster solutions that is based on MySQL.
+
+RadonDB MySQL is an open-source, cloud-native, High-Availability cluster solutions based on MySQL.
 
 # Github
 
 https://github.com/radondb/radondb-mysql-kubernetes
 
 # Features
+
 - High availability MySQL database
     - Non-centralized automatic leader election
     - Second level switch leader to follower 
@@ -50,17 +52,16 @@ $ helm delete my-release
 To delete the pvc:
 
 ```
-kubectl delete pvc data-my-release-mysql-0
-kubectl delete pvc data-my-release-mysql-1
-kubectl delete pvc data-my-release-mysql-2
+kubectl delete pvc data-my-release-radondb-mysql-0
+kubectl delete pvc data-my-release-radondb-mysql-1
+kubectl delete pvc data-my-release-radondb-mysql-2
 ```
 
 The commands remove all the Kubernetes components associated with the chart and deletes the release completely.
 
 # Configuration
 
-The following table lists the configurable parameters of the xenondb chart and their default values.
-
+The following table lists the configurable parameters of the RadonDB MySQL chart and their default values.
 
 | Parameter                                    | Description                                                                                       | Default                                     |
 | -------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------- |

diff --git a/charts/templates/_helpers.tpl b/charts/templates/_helpers.tpl
@@ -40,6 +40,6 @@ Create the name of the service account to use
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "xenondb.chart" -}}
+{{- define "radondb-mysql.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/charts/templates/configmap.yaml b/charts/templates/configmap.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 data:

diff --git a/charts/templates/rbac.yaml b/charts/templates/rbac.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 rules:
@@ -23,7 +23,7 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 roleRef:

diff --git a/charts/templates/secrets.yaml b/charts/templates/secrets.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 type: Opaque

diff --git a/charts/templates/service.yaml b/charts/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
   {{- if .Values.service.annotations }}
@@ -29,7 +29,7 @@ metadata:
   name: {{ template "fullname" . }}-leader
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 spec:
@@ -60,7 +60,7 @@ metadata:
   name: {{ template "fullname" . }}-follower
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 spec:
@@ -91,7 +91,7 @@ metadata:
   name: "{{ template "fullname" . }}-metrics"
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
   {{- if .Values.metrics.annotations }}

diff --git a/charts/templates/serviceaccount.yaml b/charts/templates/serviceaccount.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 {{- end -}}
diff --git a/charts/templates/servicemonitor.yaml b/charts/templates/servicemonitor.yaml
@@ -8,7 +8,7 @@ metadata:
   {{- end }}
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
   {{- if .Values.metrics.serviceMonitor.selector }}

diff --git a/charts/templates/statefulset.yaml b/charts/templates/statefulset.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "fullname" . }}
-    chart: {{ template "xenondb.chart" . }}
+    chart: {{ template "radondb-mysql.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
   {{- with .Values.statefulsetAnnotations }}

diff --git a/charts/values.yaml b/charts/values.yaml
@@ -1,4 +1,4 @@
-# Default values for xenondb.
+# Default values for radondb-mysql.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 

diff --git a/docs/zh-cn/charts.md b/docs/zh-cn/charts.md
@@ -1,8 +1,8 @@
-# XenonDB Charts
+# RadonDB MySQL Charts
 
 ## 简介
 
-XenonDB chart 使用 [Helm](https://helm.sh) 包管理器在 [Kubernetes](http://kubernetes.io) 集群上部署一主多从 [MySQL](https://MySQL.org) 集群。
+RadonDB MySQL chart 使用 [Helm](https://helm.sh) 包管理器在 [Kubernetes](http://kubernetes.io) 集群上部署一主多从 [MySQL](https://MySQL.org) 集群。
 
 ## 先决条件
 
@@ -37,16 +37,16 @@ $ helm delete my-release
 删除持久化存储卷:
 
 ```
-kubectl delete pvc data-my-release-xenondb-0
-kubectl delete pvc data-my-release-xenondb-1
-kubectl delete pvc data-my-release-xenondb-2
+kubectl delete pvc data-my-release-radondb-mysql-0
+kubectl delete pvc data-my-release-radondb-mysql-1
+kubectl delete pvc data-my-release-radondb-mysql-2
 ```
 
 以上指令会删除所有与该 Chart 关联的 Kubernets 组件，并彻底删除该 release。  
 
 ## 配置
 
-下表列出了 xenondb chart 的配置参数及对应的默认值。
+下表列出了 RadonDB MySQL chart 的配置参数及对应的默认值。
 
 | 参数                                          | 描述                                                     |  默认值                                 |
 | -------------------------------------------- | -------------------------------------------------------- | -------------------------------------- |