Skip to content

Always set GEOPACKAGE_DOWNLOAD_LIST #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shalucik merged 1 commit into from
Jun 19, 2025
Merged

Always set GEOPACKAGE_DOWNLOAD_LIST #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 10 additions & 14 deletions internal/controller/blobdownload/blob_download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,20 @@ func GetBlobDownloadInitContainer[O pdoknlv3.WMSWFS](obj O, images types.Images,
}
}

envVars := []corev1.EnvVar{
{
Name: "GEOPACKAGE_TARGET_PATH",
Value: "/srv/data/gpkg",
},
}
if len(blobkeys) > 0 {
envVars = append(envVars, corev1.EnvVar{
Name: "GEOPACKAGE_DOWNLOAD_LIST",
Value: strings.Join(blobkeys, ";"),
})
}

initContainer := corev1.Container{
Name: constants.BlobDownloadName,
Image: images.MultitoolImage,
ImagePullPolicy: corev1.PullIfNotPresent,
Env: envVars,
Env: []corev1.EnvVar{
{
Name: "GEOPACKAGE_TARGET_PATH",
Value: "/srv/data/gpkg",
},
{
Name: "GEOPACKAGE_DOWNLOAD_LIST",
Value: strings.Join(blobkeys, ";"),
},
},
EnvFrom: []corev1.EnvFromSource{
utils.NewEnvFromSource(utils.EnvFromSourceTypeConfigMap, blobsConfigName),
utils.NewEnvFromSource(utils.EnvFromSourceTypeSecret, blobsSecretName),
Expand Down
18 changes: 8 additions & 10 deletions internal/controller/blobdownload/gpkg_download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,14 @@ function download_all() {

# Download all geopackages from GEOPACKAGE_DOWNLOAD_LIST
# Example: GEOPACKAGE_DOWNLOAD_LIST=path/1/file.gpkg;path/3/other_file.gpkg
if [ -n "$GEOPACKAGE_DOWNLOAD_LIST" ]; then
gpkgs=(${GEOPACKAGE_DOWNLOAD_LIST//;/ })
for gpkg_path in "${gpkgs[@]}"
do
filename=$(basename $gpkg_path)
download $gpkg_path $filename
done

echo msg=\"All GeoPackages downloaded\" total_time_seconds=$(expr $(date '+%s') - $start_time)
fi
gpkgs=(${GEOPACKAGE_DOWNLOAD_LIST//;/ })
for gpkg_path in "${gpkgs[@]}"
do
filename=$(basename $gpkg_path)
download $gpkg_path $filename
done

echo msg=\"All GeoPackages downloaded\" total_time_seconds=$(expr $(date '+%s') - $start_time)
}

function rm_file_and_exit() {
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wfs/complete/expected/configmap-init-scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ metadata:
service-type: wfs
service-version: v1_0
theme: theme
name: complete-wfs-init-scripts-dcmbkf564h
name: complete-wfs-init-scripts-fft29bbtdd
namespace: default
ownerReferences:
- apiVersion: pdok.nl/v3
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wfs/complete/expected/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ spec:
name: mapserver
- configMap:
defaultMode: 511
name: complete-wfs-init-scripts-dcmbkf564h
name: complete-wfs-init-scripts-fft29bbtdd
name: init-scripts
- configMap:
name: complete-wfs-capabilities-generator-g7fh2dbt4m
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wfs/minimal/expected/configmap-init-scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
pdok.nl/inspire: 'false'
service-type: wfs
service-version: v1_0
name: minimal-wfs-init-scripts-dcmbkf564h
name: minimal-wfs-init-scripts-fft29bbtdd
namespace: default
ownerReferences:
- apiVersion: pdok.nl/v3
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wfs/minimal/expected/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ spec:
name: mapserver
- configMap:
defaultMode: 511
name: minimal-wfs-init-scripts-dcmbkf564h
name: minimal-wfs-init-scripts-fft29bbtdd
name: init-scripts
- configMap:
name: minimal-wfs-capabilities-generator-m46924mtk7
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wms/complete/expected/configmap-init-scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ metadata:
service-type: wms
service-version: v1_0
theme: "2016"
name: complete-wms-init-scripts-dcmbkf564h
name: complete-wms-init-scripts-fft29bbtdd
namespace: default
ownerReferences:
- apiVersion: pdok.nl/v3
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wms/complete/expected/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ spec:
name: ogc-webservice-proxy-config
- configMap:
defaultMode: 511
name: complete-wms-init-scripts-dcmbkf564h
name: complete-wms-init-scripts-fft29bbtdd
name: init-scripts
- configMap:
name: complete-wms-capabilities-generator-ccc59c7dhm
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wms/custom-mapfile/expected/configmap-init-scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ metadata:
pdok.nl/inspire: "false"
service-type: wms
service-version: v1_0
name: custom-mapfile-wms-init-scripts-dcmbkf564h
name: custom-mapfile-wms-init-scripts-fft29bbtdd
namespace: default
ownerReferences:
- apiVersion: pdok.nl/v3
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wms/custom-mapfile/expected/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ spec:
name: ogc-webservice-proxy-config
- configMap:
defaultMode: 511
name: custom-mapfile-wms-init-scripts-dcmbkf564h
name: custom-mapfile-wms-init-scripts-fft29bbtdd
name: init-scripts
- configMap:
name: custom-mapfile-wms-capabilities-generator-fbhc96kd2b
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wms/minimal/expected/configmap-init-scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ metadata:
pdok.nl/inspire: "false"
service-type: wms
service-version: v1_0
name: minimal-wms-init-scripts-dcmbkf564h
name: minimal-wms-init-scripts-fft29bbtdd
namespace: default
ownerReferences:
- apiVersion: pdok.nl/v3
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wms/minimal/expected/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ spec:
name: ogc-webservice-proxy-config
- configMap:
defaultMode: 511
name: minimal-wms-init-scripts-dcmbkf564h
name: minimal-wms-init-scripts-fft29bbtdd
name: init-scripts
- configMap:
name: minimal-wms-capabilities-generator-fbhc96kd2b
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wms/patches/expected/configmap-init-scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ metadata:
pdok.nl/inspire: "false"
service-type: wms
service-version: v1_0
name: patches-wms-init-scripts-dcmbkf564h
name: patches-wms-init-scripts-fft29bbtdd
namespace: default
ownerReferences:
- apiVersion: pdok.nl/v3
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/test_data/wms/patches/expected/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ spec:
name: ogc-webservice-proxy-config
- configMap:
defaultMode: 511
name: patches-wms-init-scripts-dcmbkf564h
name: patches-wms-init-scripts-fft29bbtdd
name: init-scripts
- configMap:
name: patches-wms-capabilities-generator-hbgd5m652m
Expand Down
Loading