Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/controller/blobdownload/blob_download.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func GetBlobDownloadInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Images)
},
Command: []string{"/bin/sh", "-c"},
VolumeMounts: []corev1.VolumeMount{
utils.GetBaseVolumeMount(),
utils.GetBaseVolumeMount(false),
utils.GetDataVolumeMount(),
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func GetFeatureinfoGeneratorInitContainer(images types.Images) (*corev1.Containe
"feature-info",
},
VolumeMounts: []corev1.VolumeMount{
utils.GetBaseVolumeMount(),
utils.GetBaseVolumeMount(false),
utils.GetConfigVolumeMount(constants.ConfigMapFeatureinfoGeneratorVolumeName),
},
}
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/legendgenerator/legend_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ exit $exit_code;
`,
},
VolumeMounts: []corev1.VolumeMount{
utils.GetBaseVolumeMount(),
utils.GetBaseVolumeMount(false),
utils.GetDataVolumeMount(),
{Name: constants.MapserverName, MountPath: "/srv/mapserver/config/default_mapserver.conf", SubPath: "default_mapserver.conf"},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/mapfilegenerator/mapfile_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func GetMapfileGeneratorInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Ima
"/srv/data/config/mapfile",
},
VolumeMounts: []corev1.VolumeMount{
utils.GetBaseVolumeMount(),
utils.GetBaseVolumeMount(false),
utils.GetConfigVolumeMount(constants.ConfigMapMapfileGeneratorVolumeName),
},
}
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/mapserver/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func GetMapserverContainer[O pdoknlv3.WMSWFS](obj O, images types.Images) (*core

func getVolumeMounts(customMapfile bool) []corev1.VolumeMount {
volumeMounts := []corev1.VolumeMount{
utils.GetBaseVolumeMount(),
utils.GetBaseVolumeMount(true),
utils.GetDataVolumeMount(),
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
volumeMounts:
- mountPath: /srv/data
name: base
readOnly: true
- mountPath: /var/www
name: data
- mountPath: /srv/mapserver/config/include.conf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ spec:
volumeMounts:
- mountPath: /srv/data
name: base
readOnly: false
readOnly: true
- mountPath: /var/www
name: data
readOnly: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
volumeMounts:
- mountPath: /srv/data
name: base
readOnly: false
readOnly: true
- mountPath: /var/www
name: data
readOnly: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ spec:
volumeMounts:
- mountPath: /srv/data
name: base
readOnly: false
readOnly: true
- mountPath: /var/www
name: data
readOnly: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
volumeMounts:
- mountPath: /srv/data
name: base
readOnly: false
readOnly: true
- mountPath: /var/www
name: data
readOnly: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
volumeMounts:
- mountPath: /srv/data
name: base
readOnly: false
readOnly: true
- mountPath: /var/www
name: data
readOnly: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
volumeMounts:
- mountPath: /srv/data
name: base
readOnly: false
readOnly: true
- mountPath: /var/www
name: data
readOnly: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ spec:
volumeMounts:
- mountPath: /srv/data
name: base
readOnly: false
readOnly: true
- mountPath: /var/www
name: data
readOnly: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ spec:
mountPath: /patch
- name: base
mountPath: /srv/data
readOnly: true
- name: data
mountPath: /var/www
- mountPath: /srv/mapserver/config/include.conf
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ func NewEnvFromSource(t EnvFromSourceType, name string) corev1.EnvFromSource {
}
}

func GetBaseVolumeMount() corev1.VolumeMount {
return corev1.VolumeMount{Name: constants.BaseVolumeName, MountPath: "/srv/data", ReadOnly: false}
func GetBaseVolumeMount(readOnly bool) corev1.VolumeMount {
return corev1.VolumeMount{Name: constants.BaseVolumeName, MountPath: "/srv/data", ReadOnly: readOnly}
}

func GetDataVolumeMount() corev1.VolumeMount {
Expand Down
Loading