Skip to content

Commit 8669092

Browse files
committed
*: Rename mysql config and volume.
1 parent 3375b1c commit 8669092

File tree

15 files changed

+57
-55
lines changed

15 files changed

+57
-55
lines changed

controllers/mysqlcluster_controller.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ func (r *MysqlClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
9999
}
100100
}()
101101

102-
configMapSyncer := clustersyncer.NewConfigMapSyncer(r.Client, instance)
103-
if err = syncer.Sync(ctx, configMapSyncer, r.Recorder); err != nil {
102+
mysqlCMSyncer := clustersyncer.NewMysqlCMSyncer(r.Client, instance)
103+
if err = syncer.Sync(ctx, mysqlCMSyncer, r.Recorder); err != nil {
104104
return ctrl.Result{}, err
105105
}
106106

@@ -109,7 +109,8 @@ func (r *MysqlClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
109109
return ctrl.Result{}, err
110110
}
111111

112-
cmRev := configMapSyncer.Object().(*corev1.ConfigMap).ResourceVersion
112+
// Todo: modify mysql cm will trigger rolling update but it will not be applied.
113+
cmRev := mysqlCMSyncer.Object().(*corev1.ConfigMap).ResourceVersion
113114
sctRev := secretSyncer.Object().(*corev1.Secret).ResourceVersion
114115

115116
r.XenonExecutor.SetRootPassword(instance.Spec.MysqlOpts.RootPassword)

mysqlcluster/container/backup.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ func (c *backupSidecar) getReadinessProbe() *corev1.Probe {
128128
func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {
129129
return []corev1.VolumeMount{
130130
{
131-
Name: utils.ConfVolumeName,
132-
MountPath: utils.ConfVolumeMountPath,
131+
Name: utils.MysqlConfVolumeName,
132+
MountPath: utils.MysqlConfVolumeMountPath,
133133
},
134134
{
135135
Name: utils.DataVolumeName,

mysqlcluster/container/init_mysql.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ func (c *initMysql) getReadinessProbe() *corev1.Probe {
110110
func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {
111111
return []corev1.VolumeMount{
112112
{
113-
Name: utils.ConfVolumeName,
114-
MountPath: utils.ConfVolumeMountPath,
113+
Name: utils.MysqlConfVolumeName,
114+
MountPath: utils.MysqlConfVolumeMountPath,
115115
},
116116
{
117117
Name: utils.DataVolumeName,

mysqlcluster/container/init_mysql_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ var (
5353
}
5454
initMysqlVolumeMounts = []corev1.VolumeMount{
5555
{
56-
Name: utils.ConfVolumeName,
57-
MountPath: utils.ConfVolumeMountPath,
56+
Name: utils.MysqlConfVolumeName,
57+
MountPath: utils.MysqlConfVolumeMountPath,
5858
},
5959
{
6060
Name: utils.DataVolumeName,

mysqlcluster/container/init_sidecar.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ func (c *initSidecar) getReadinessProbe() *corev1.Probe {
163163
func (c *initSidecar) getVolumeMounts() []corev1.VolumeMount {
164164
volumeMounts := []corev1.VolumeMount{
165165
{
166-
Name: utils.ConfVolumeName,
167-
MountPath: utils.ConfVolumeMountPath,
166+
Name: utils.MysqlConfVolumeName,
167+
MountPath: utils.MysqlConfVolumeMountPath,
168168
},
169169
{
170-
Name: utils.ConfMapVolumeName,
171-
MountPath: utils.ConfMapVolumeMountPath,
170+
Name: utils.MysqlCMVolumeName,
171+
MountPath: utils.MysqlCMVolumeMountPath,
172172
},
173173
{
174174
Name: utils.ScriptsVolumeName,

mysqlcluster/container/init_sidecar_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,12 @@ var (
272272
}
273273
defaultInitsidecarVolumeMounts = []corev1.VolumeMount{
274274
{
275-
Name: utils.ConfVolumeName,
276-
MountPath: utils.ConfVolumeMountPath,
275+
Name: utils.MysqlConfVolumeName,
276+
MountPath: utils.MysqlConfVolumeMountPath,
277277
},
278278
{
279-
Name: utils.ConfMapVolumeName,
280-
MountPath: utils.ConfMapVolumeMountPath,
279+
Name: utils.MysqlCMVolumeName,
280+
MountPath: utils.MysqlCMVolumeMountPath,
281281
},
282282
{
283283
Name: utils.ScriptsVolumeName,

mysqlcluster/container/mysql.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ func (c *mysql) getReadinessProbe() *corev1.Probe {
135135
func (c *mysql) getVolumeMounts() []corev1.VolumeMount {
136136
return []corev1.VolumeMount{
137137
{
138-
Name: utils.ConfVolumeName,
139-
MountPath: utils.ConfVolumeMountPath,
138+
Name: utils.MysqlConfVolumeName,
139+
MountPath: utils.MysqlConfVolumeMountPath,
140140
},
141141
{
142142
Name: utils.DataVolumeName,

mysqlcluster/container/mysql_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func TestGetMysqlReadinessProbe(t *testing.T) {
141141
func TestGetMysqlVolumeMounts(t *testing.T) {
142142
volumeMounts := []corev1.VolumeMount{
143143
{
144-
Name: "conf",
144+
Name: "mysql-conf",
145145
MountPath: "/etc/mysql",
146146
},
147147
{

mysqlcluster/mysqlcluster.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (c *MysqlCluster) EnsureVolumes() []corev1.Volume {
193193

194194
volumes = append(volumes,
195195
corev1.Volume{
196-
Name: utils.ConfVolumeName,
196+
Name: utils.MysqlConfVolumeName,
197197
VolumeSource: corev1.VolumeSource{
198198
EmptyDir: &corev1.EmptyDirVolumeSource{},
199199
},
@@ -205,7 +205,7 @@ func (c *MysqlCluster) EnsureVolumes() []corev1.Volume {
205205
},
206206
},
207207
corev1.Volume{
208-
Name: utils.ConfMapVolumeName,
208+
Name: utils.MysqlCMVolumeName,
209209
VolumeSource: corev1.VolumeSource{
210210
ConfigMap: &corev1.ConfigMapVolumeSource{
211211
LocalObjectReference: corev1.LocalObjectReference{

mysqlcluster/mysqlcluster_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func TestGetPodHostName(t *testing.T) {
245245
func TestEnsureVolumes(t *testing.T) {
246246
volume := []corev1.Volume{
247247
{
248-
Name: utils.ConfVolumeName,
248+
Name: utils.MysqlConfVolumeName,
249249
VolumeSource: corev1.VolumeSource{
250250
EmptyDir: &corev1.EmptyDirVolumeSource{},
251251
},
@@ -257,7 +257,7 @@ func TestEnsureVolumes(t *testing.T) {
257257
},
258258
},
259259
{
260-
Name: utils.ConfMapVolumeName,
260+
Name: utils.MysqlCMVolumeName,
261261
VolumeSource: corev1.VolumeSource{
262262
ConfigMap: &corev1.ConfigMapVolumeSource{
263263
LocalObjectReference: corev1.LocalObjectReference{

0 commit comments

Comments
 (0)