Skip to content

Commit 1bf4584

Browse files
committed
Revert "fix: prefix extension volume names to avoid collisions"
This reverts commit 6d040d4.
1 parent 6d040d4 commit 1bf4584

4 files changed

Lines changed: 20 additions & 25 deletions

File tree

‎internal/webhook/v1/cluster_webhook.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2826,7 +2826,7 @@ func (v *ClusterCustomValidator) validateExtensions(r *apiv1.Cluster) field.Erro
28262826
}
28272827
extensionNames.Put(v.Name)
28282828

2829-
sanitizedName := "ext-" + strings.ReplaceAll(v.Name, "_", "-")
2829+
sanitizedName := strings.ReplaceAll(v.Name, "_", "-")
28302830
if sanitizedVolumeNames.Has(sanitizedName) {
28312831
result = append(result, field.Invalid(
28322832
basePath.Child("name"),

‎pkg/specs/volumes.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,13 +321,10 @@ func createProjectedVolume(cluster *apiv1.Cluster) corev1.Volume {
321321
}
322322
}
323323

324-
// sanitizeExtensionNameForVolume produces a Kubernetes-compliant volume name
325-
// for an extension. It adds an "ext-" prefix to avoid collisions with system
326-
// volume names (e.g. pgdata, shm, pg-wal) and replaces underscores with
327-
// hyphens to comply with RFC 1123 DNS label requirements.
328-
// The mount path preserves the original extension name.
324+
// sanitizeExtensionNameForVolume replaces underscores with hyphens to comply with RFC 1123
325+
// DNS label requirements for Kubernetes volume names. The mount path preserves the original name.
329326
func sanitizeExtensionNameForVolume(extensionName string) string {
330-
return "ext-" + strings.ReplaceAll(extensionName, "_", "-")
327+
return strings.ReplaceAll(extensionName, "_", "-")
331328
}
332329

333330
func createExtensionVolumes(cluster *apiv1.Cluster) []corev1.Volume {

‎pkg/specs/volumes_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,9 @@ var _ = Describe("ImageVolume Extensions", func() {
566566
It("should create a Volume for each Extension", func() {
567567
extensionVolumes := createExtensionVolumes(&cluster)
568568
Expect(len(extensionVolumes)).To(BeEquivalentTo(2))
569-
Expect(extensionVolumes[0].Name).To(Equal("ext-foo"))
569+
Expect(extensionVolumes[0].Name).To(Equal("foo"))
570570
Expect(extensionVolumes[0].VolumeSource.Image.Reference).To(Equal("foo:dev"))
571-
Expect(extensionVolumes[1].Name).To(Equal("ext-bar"))
571+
Expect(extensionVolumes[1].Name).To(Equal("bar"))
572572
Expect(extensionVolumes[1].VolumeSource.Image.Reference).To(Equal("bar:dev"))
573573
})
574574
It("should sanitize extension names with underscores for volume names", func() {
@@ -582,7 +582,7 @@ var _ = Describe("ImageVolume Extensions", func() {
582582
}
583583
extensionVolumes := createExtensionVolumes(&cluster)
584584
Expect(len(extensionVolumes)).To(BeEquivalentTo(1))
585-
Expect(extensionVolumes[0].Name).To(Equal("ext-pg-ivm"))
585+
Expect(extensionVolumes[0].Name).To(Equal("pg-ivm"))
586586
Expect(extensionVolumes[0].VolumeSource.Image.Reference).To(Equal("pg_ivm:latest"))
587587
})
588588
})
@@ -604,9 +604,9 @@ var _ = Describe("ImageVolume Extensions", func() {
604604
)
605605
extensionVolumeMounts := createExtensionVolumeMounts(&cluster)
606606
Expect(len(extensionVolumeMounts)).To(BeEquivalentTo(2))
607-
Expect(extensionVolumeMounts[0].Name).To(Equal("ext-foo"))
607+
Expect(extensionVolumeMounts[0].Name).To(Equal("foo"))
608608
Expect(extensionVolumeMounts[0].MountPath).To(Equal(fooMountPath))
609-
Expect(extensionVolumeMounts[1].Name).To(Equal("ext-bar"))
609+
Expect(extensionVolumeMounts[1].Name).To(Equal("bar"))
610610
Expect(extensionVolumeMounts[1].MountPath).To(Equal(barMountPath))
611611
})
612612
It("should sanitize extension names with underscores for volume mount names", func() {
@@ -620,32 +620,32 @@ var _ = Describe("ImageVolume Extensions", func() {
620620
}
621621
extensionVolumeMounts := createExtensionVolumeMounts(&cluster)
622622
Expect(len(extensionVolumeMounts)).To(BeEquivalentTo(1))
623-
Expect(extensionVolumeMounts[0].Name).To(Equal("ext-pg-ivm"))
623+
Expect(extensionVolumeMounts[0].Name).To(Equal("pg-ivm"))
624624
Expect(extensionVolumeMounts[0].MountPath).To(Equal(postgres.ExtensionsBaseDirectory + "/pg_ivm"))
625625
})
626626
})
627627
})
628628

629629
Context("sanitizeExtensionNameForVolume", func() {
630-
It("should add ext- prefix and replace underscores with hyphens", func() {
631-
Expect(sanitizeExtensionNameForVolume("pg_ivm")).To(Equal("ext-pg-ivm"))
630+
It("should replace underscores with hyphens", func() {
631+
Expect(sanitizeExtensionNameForVolume("pg_ivm")).To(Equal("pg-ivm"))
632632
})
633633

634634
It("should handle multiple underscores", func() {
635-
Expect(sanitizeExtensionNameForVolume("my_custom_extension")).To(Equal("ext-my-custom-extension"))
635+
Expect(sanitizeExtensionNameForVolume("my_custom_extension")).To(Equal("my-custom-extension"))
636636
})
637637

638-
It("should add ext- prefix to names without underscores", func() {
639-
Expect(sanitizeExtensionNameForVolume("foo")).To(Equal("ext-foo"))
640-
Expect(sanitizeExtensionNameForVolume("foo-bar")).To(Equal("ext-foo-bar"))
638+
It("should not modify names without underscores", func() {
639+
Expect(sanitizeExtensionNameForVolume("foo")).To(Equal("foo"))
640+
Expect(sanitizeExtensionNameForVolume("foo-bar")).To(Equal("foo-bar"))
641641
})
642642

643643
It("should handle mixed underscores and hyphens", func() {
644-
Expect(sanitizeExtensionNameForVolume("pg_foo-bar")).To(Equal("ext-pg-foo-bar"))
644+
Expect(sanitizeExtensionNameForVolume("pg_foo-bar")).To(Equal("pg-foo-bar"))
645645
})
646646

647647
It("should handle consecutive underscores", func() {
648-
Expect(sanitizeExtensionNameForVolume("pg__stat")).To(Equal("ext-pg--stat"))
648+
Expect(sanitizeExtensionNameForVolume("pg__stat")).To(Equal("pg--stat"))
649649
})
650650
})
651651
})

‎tests/e2e/imagevolume_extensions_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,10 @@ var _ = Describe("ImageVolume Extensions", Label(tests.LabelImageVolumeExtension
7575

7676
assertVolumeMounts := func(podList *corev1.PodList, imageVolumeExtension string) {
7777
found := false
78-
volumeName := "ext-" + strings.ReplaceAll(imageVolumeExtension, "_", "-")
7978
mountPath := filepath.Join(postgres.ExtensionsBaseDirectory, imageVolumeExtension)
8079
for _, pod := range podList.Items {
8180
for _, volumeMount := range pod.Spec.Containers[0].VolumeMounts {
82-
if volumeMount.Name == volumeName && volumeMount.MountPath == mountPath {
81+
if volumeMount.Name == imageVolumeExtension && volumeMount.MountPath == mountPath {
8382
found = true
8483
}
8584
}
@@ -89,10 +88,9 @@ var _ = Describe("ImageVolume Extensions", Label(tests.LabelImageVolumeExtension
8988

9089
assertVolumes := func(podList *corev1.PodList, imageVolumeExtension string) {
9190
found := false
92-
volumeName := "ext-" + strings.ReplaceAll(imageVolumeExtension, "_", "-")
9391
for _, pod := range podList.Items {
9492
for _, volume := range pod.Spec.Volumes {
95-
if volume.Name == volumeName && volume.Image.Reference != "" {
93+
if volume.Name == imageVolumeExtension && volume.Image.Reference != "" {
9694
found = true
9795
}
9896
}

0 commit comments

Comments
 (0)