diff --git a/charts/sophora-import-job/Chart.yaml b/charts/sophora-import-job/Chart.yaml index cde33b2..6b24c3a 100644 --- a/charts/sophora-import-job/Chart.yaml +++ b/charts/sophora-import-job/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.2 +version: 1.1.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sophora-import-job/README.md b/charts/sophora-import-job/README.md index d25e273..14de1eb 100644 --- a/charts/sophora-import-job/README.md +++ b/charts/sophora-import-job/README.md @@ -8,6 +8,11 @@ A one-time Sophora Importer that runs as a k8s job and imports the data from s3 Additional environment variables are supported via `importer.extraEnv`. The variables have to be defined in kubernetes env format. +## Supported archive formats + +* `.zip` +* `.tar.gz` + ## Import transformation files via S3 or HTTP Activate transformations by setting `transformation.enabled` to `true`. Now you can reference one or more zip files via s3 or http @@ -51,7 +56,7 @@ transformation: secretName: "read-only-bucket-secret" bucketName: "bucket-with-transformations" zipPaths: - - "/transformation-data.zip" + - "/transformation-data.tar.gz" useSaxon: true saxonLicenceSecretName: "saxon-license" saxonLicenceSecretKey: "saxon-license.lic" diff --git a/charts/sophora-import-job/scripts/copy_data_to_import_dirs.sh b/charts/sophora-import-job/scripts/copy_data_to_import_dirs.sh index f414b31..ae5469e 100644 --- a/charts/sophora-import-job/scripts/copy_data_to_import_dirs.sh +++ b/charts/sophora-import-job/scripts/copy_data_to_import_dirs.sh @@ -8,7 +8,9 @@ downloadDurationMillis=$((downloadEnd-jobStart)) downloadDurationSeconds=$(awk -v millis=$downloadDurationMillis 'BEGIN { print ( millis / 1000 ) }') for file in `ls *.zip`; do unzip "$file"; done -rm *.zip; +for file in `ls *.tar.gz`; do tar -zxvf "$file"; done +rm *.zip +rm *.tar.gz mkdir -p /import/incoming mkdir -p /import/temp mkdir -p /import/success