Skip to content

Commit 28f3a92

Browse files
committed
polish builtin mysql resource name
1 parent 89b5007 commit 28f3a92

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

charts/cmdb/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.4
18+
version: 0.1.5
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/cmdb/templates/_config.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ TZ: "Asia/Shanghai"
33
{{- $mysqlHost := (printf "%s:%s" .Values.api.mysql.host .Values.api.mysql.port) -}}
44
{{- $redisHost := (printf "%s:%s" .Values.api.redis.host .Values.api.redis.port) -}}
55
{{- if .Values.api.mysql.builtIn }}
6-
MYSQL_HOST: "{{ .Release.Name }}-mysql"
6+
MYSQL_HOST: "{{ .Release.Name }}-builtin-mysql"
77
MYSQL_PORT: "3306"
88
MYSQL_USER: "root"
99
MYSQL_DATABASE: "cmdb"

charts/cmdb/templates/mysql.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: {{ .Release.Name }}-mysql
5+
name: {{ .Release.Name }}-builtin-mysql
66
spec:
77
ports:
88
- port: 3306
99
selector:
10-
app: {{ .Release.Name }}-mysql
10+
app: {{ .Release.Name }}-builtin-mysql
1111
type: ClusterIP
1212
---
1313

1414
apiVersion: apps/v1
1515
kind: Deployment
1616
metadata:
17-
name: {{ .Release.Name }}-mysql
17+
name: {{ .Release.Name }}-builtin-mysql
1818
spec:
1919
selector:
2020
matchLabels:
21-
app: {{ .Release.Name }}-mysql
21+
app: {{ .Release.Name }}-builtin-mysql
2222
strategy:
2323
type: Recreate
2424
template:
2525
metadata:
2626
labels:
27-
app: {{ .Release.Name }}-mysql
27+
app: {{ .Release.Name }}-builtin-mysql
2828
spec:
2929
containers:
3030
- name: mysql
@@ -54,16 +54,16 @@ spec:
5454
volumes:
5555
- name: mysql-persistent-storage
5656
persistentVolumeClaim:
57-
claimName: {{ .Release.Name }}-mysql
57+
claimName: {{ .Release.Name }}-builtin-mysql
5858
- name: mysql-config
5959
configMap:
60-
name: {{ .Release.Name }}-mysql-config
60+
name: {{ .Release.Name }}-builtin-mysql-config
6161
---
6262

6363
apiVersion: v1
6464
kind: PersistentVolumeClaim
6565
metadata:
66-
name: {{ .Release.Name }}-mysql
66+
name: {{ .Release.Name }}-builtin-mysql
6767
namespace: {{ .Release.Namespace }}
6868
spec:
6969
accessModes:
@@ -76,7 +76,7 @@ spec:
7676
apiVersion: v1
7777
kind: ConfigMap
7878
metadata:
79-
name: {{ .Release.Name }}-mysql-config
79+
name: {{ .Release.Name }}-builtin-mysql-config
8080
namespace: {{ .Release.Namespace }}
8181
data:
8282
initdb.sql: |

0 commit comments

Comments
 (0)