Skip to content

Commit 9816674

Browse files
committed
remove version check from pmm v3 container
1 parent 2d6c9dc commit 9816674

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

percona/pmm/pmm.go

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -277,20 +277,6 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
277277
if pgc.Spec.PMM.CustomClusterName != "" {
278278
clusterName = pgc.Spec.PMM.CustomClusterName
279279
}
280-
volumeMounts := []corev1.VolumeMount{
281-
{
282-
Name: "cert-volume",
283-
MountPath: "/pgconf/tls",
284-
ReadOnly: true,
285-
},
286-
}
287-
if pgc.CompareVersion("2.7.0") >= 0 {
288-
volumeMounts = append(volumeMounts, corev1.VolumeMount{
289-
Name: postgres.DataVolumeMount().Name,
290-
MountPath: postgres.DataVolumeMount().MountPath,
291-
ReadOnly: true,
292-
})
293-
}
294280

295281
container := corev1.Container{
296282
Name: "pmm-client",
@@ -324,7 +310,19 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
324310
},
325311
},
326312
},
327-
VolumeMounts: volumeMounts,
313+
VolumeMounts: []corev1.VolumeMount{
314+
{
315+
Name: "cert-volume",
316+
MountPath: "/pgconf/tls",
317+
ReadOnly: true,
318+
},
319+
{
320+
Name: postgres.DataVolumeMount().Name,
321+
MountPath: postgres.DataVolumeMount().MountPath,
322+
ReadOnly: true,
323+
},
324+
},
325+
328326
Env: []corev1.EnvVar{
329327
{
330328
Name: "POD_NAME",

0 commit comments

Comments
 (0)