Use same naming strategy as for cluster

redhat-developer · Nov 23, 2022 · 2c0af4d · 2c0af4d
1 parent 4adb74e
commit 2c0af4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/dev/podmandev/pod.go b/pkg/dev/podmandev/pod.go
@@ -44,15 +44,15 @@ func createPodFromComponent(
 			Name: storage.OdoSourceVolume,
 			VolumeSource: corev1.VolumeSource{
 				PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
-					ClaimName: getVolumeName(componentName, appName, "source"),
+					ClaimName: getVolumeName(componentName, appName, "odo-projects"),
 				},
 			},
 		},
 		{
 			Name: storage.SharedDataVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
-					ClaimName: getVolumeName(componentName, appName, "shared"),
+					ClaimName: getVolumeName(componentName, appName, "odo-shared"),
 				},
 			},
 		},
@@ -97,7 +97,7 @@ func createPodFromComponent(
 }
 
 func getVolumeName(componentName string, appName string, volume string) string {
-	return "odo-projects-" + componentName + "-" + appName + "-" + volume
+	return volume + "-" + componentName + "-" + appName
 }
 
 func addHostPorts(containers []corev1.Container) []api.ForwardedPort {

diff --git a/pkg/dev/podmandev/pod_test.go b/pkg/dev/podmandev/pod_test.go
@@ -84,15 +84,15 @@ var (
 					Name: "odo-projects",
 					VolumeSource: corev1.VolumeSource{
 						PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
-							ClaimName: "odo-projects-mycmp-app-source",
+							ClaimName: "odo-projects-mycmp-app",
 						},
 					},
 				},
 				{
 					Name: "odo-shared-data",
 					VolumeSource: corev1.VolumeSource{
 						PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
-							ClaimName: "odo-projects-mycmp-app-shared",
+							ClaimName: "odo-shared-mycmp-app",
 						},
 					},
 				},
@@ -304,7 +304,7 @@ func Test_createPodFromComponent(t *testing.T) {
 					Name: volume.Name,
 					VolumeSource: corev1.VolumeSource{
 						PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
-							ClaimName: "odo-projects-" + devfileName + "-" + appName + "-" + volume.Name,
+							ClaimName: volume.Name + "-" + devfileName + "-" + appName,
 						},
 					},
 				})