Skip to content

Commit

Permalink
polish builtin mysql resource name
Browse files Browse the repository at this point in the history
  • Loading branch information
JaredTan95 committed Jun 14, 2024
1 parent 89b5007 commit 28f3a92
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion charts/cmdb/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.4
version: 0.1.5

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion charts/cmdb/templates/_config.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TZ: "Asia/Shanghai"
{{- $mysqlHost := (printf "%s:%s" .Values.api.mysql.host .Values.api.mysql.port) -}}
{{- $redisHost := (printf "%s:%s" .Values.api.redis.host .Values.api.redis.port) -}}
{{- if .Values.api.mysql.builtIn }}
MYSQL_HOST: "{{ .Release.Name }}-mysql"
MYSQL_HOST: "{{ .Release.Name }}-builtin-mysql"
MYSQL_PORT: "3306"
MYSQL_USER: "root"
MYSQL_DATABASE: "cmdb"
Expand Down
18 changes: 9 additions & 9 deletions charts/cmdb/templates/mysql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Release.Name }}-mysql
name: {{ .Release.Name }}-builtin-mysql
spec:
ports:
- port: 3306
selector:
app: {{ .Release.Name }}-mysql
app: {{ .Release.Name }}-builtin-mysql
type: ClusterIP
---

apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Release.Name }}-mysql
name: {{ .Release.Name }}-builtin-mysql
spec:
selector:
matchLabels:
app: {{ .Release.Name }}-mysql
app: {{ .Release.Name }}-builtin-mysql
strategy:
type: Recreate
template:
metadata:
labels:
app: {{ .Release.Name }}-mysql
app: {{ .Release.Name }}-builtin-mysql
spec:
containers:
- name: mysql
Expand Down Expand Up @@ -54,16 +54,16 @@ spec:
volumes:
- name: mysql-persistent-storage
persistentVolumeClaim:
claimName: {{ .Release.Name }}-mysql
claimName: {{ .Release.Name }}-builtin-mysql
- name: mysql-config
configMap:
name: {{ .Release.Name }}-mysql-config
name: {{ .Release.Name }}-builtin-mysql-config
---

apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ .Release.Name }}-mysql
name: {{ .Release.Name }}-builtin-mysql
namespace: {{ .Release.Namespace }}
spec:
accessModes:
Expand All @@ -76,7 +76,7 @@ spec:
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-mysql-config
name: {{ .Release.Name }}-builtin-mysql-config
namespace: {{ .Release.Namespace }}
data:
initdb.sql: |
Expand Down

0 comments on commit 28f3a92

Please sign in to comment.