@@ -28,38 +28,25 @@ pub enum Error {
28
28
29
29
#[ snafu( display(
30
30
"The volumeMount is clashing with an already existing volumeMount with the same mountPath but a different content. \
31
- The shared mountPath is {:?}, \
32
- the existing mount's volume name is {:?}, \
33
- the existing mount's subPath is {:?}, \
34
- the existing mount's SubPathExpr is {:?}, \
35
- the new mount's volume name is {:?}, \
36
- the new mount's subPath is {:?}, \
37
- the new mount's SubPathExpr is {:?}",
38
- details. mount_path,
39
- details. existing_volume_name,
40
- details. existing_sub_path,
41
- details. existing_sub_path_expr,
42
- details. new_volume_name,
43
- details. new_sub_path,
44
- details. new_sub_path_expr
31
+ The shared mountPath is {mount_path:?}, \
32
+ the existing mount's volume name is {existing_volume_name:?}, \
33
+ the existing mount's subPath is {existing_sub_path:?}, \
34
+ the existing mount's SubPathExpr is {existing_sub_path_expr:?}, \
35
+ the new mount's volume name is {new_volume_name:?}, \
36
+ the new mount's subPath is {new_sub_path:?}, \
37
+ the new mount's SubPathExpr is {new_sub_path_expr:?}"
45
38
) ) ]
46
39
ClashingMountPath {
47
- /// We need to box the details, so that the [`Error`] enum does not get too big
48
- details : Box < ClashingMountPathDetails > ,
40
+ mount_path : String ,
41
+ existing_volume_name : String ,
42
+ existing_sub_path : Option < String > ,
43
+ existing_sub_path_expr : Option < String > ,
44
+ new_volume_name : String ,
45
+ new_sub_path : Option < String > ,
46
+ new_sub_path_expr : Option < String > ,
49
47
} ,
50
48
}
51
49
52
- #[ derive( Debug ) ]
53
- pub struct ClashingMountPathDetails {
54
- mount_path : String ,
55
- existing_volume_name : String ,
56
- existing_sub_path : Option < String > ,
57
- existing_sub_path_expr : Option < String > ,
58
- new_volume_name : String ,
59
- new_sub_path : Option < String > ,
60
- new_sub_path_expr : Option < String > ,
61
- }
62
-
63
50
/// A builder to build [`Container`] objects.
64
51
///
65
52
/// This will automatically create the necessary volumes and mounts for each `ConfigMap` which is added.
@@ -244,15 +231,13 @@ impl ContainerBuilder {
244
231
ensure ! (
245
232
existing_volume_mount == & volume_mount,
246
233
ClashingMountPathSnafu {
247
- details: Box :: new( ClashingMountPathDetails {
248
- mount_path: volume_mount. mount_path,
249
- existing_volume_name: existing_volume_mount. name. clone( ) ,
250
- existing_sub_path: existing_volume_mount. sub_path. clone( ) ,
251
- existing_sub_path_expr: existing_volume_mount. sub_path_expr. clone( ) ,
252
- new_volume_name: volume_mount. name,
253
- new_sub_path: volume_mount. sub_path,
254
- new_sub_path_expr: volume_mount. sub_path_expr,
255
- } ) ,
234
+ mount_path: volume_mount. mount_path,
235
+ existing_volume_name: existing_volume_mount. name. clone( ) ,
236
+ existing_sub_path: existing_volume_mount. sub_path. clone( ) ,
237
+ existing_sub_path_expr: existing_volume_mount. sub_path_expr. clone( ) ,
238
+ new_volume_name: volume_mount. name,
239
+ new_sub_path: volume_mount. sub_path,
240
+ new_sub_path_expr: volume_mount. sub_path_expr,
256
241
}
257
242
) ;
258
243
} else {
0 commit comments