Merge pull request #253 from RADAR-base/version/radar-output-restruct…

…ure-3.0.1

[radar-output-restructure] Upgrade app version to 3.0.1

charts/radar-output/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.3.1"
+appVersion: "3.0.1"
 description: A Helm chart for RADAR-base output restructure service. This application reads data from intermediate storage and restructure the data into project-> subject-id-> data topic -> data split per hour. This service offers few options to choose the source and target of the pipeline.
 name: radar-output
-version: 0.5.0
+version: 1.0.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-output
@@ -18,9 +18,9 @@ maintainers:
   - email: [email protected]
     name: Keyvan Hedayati
     url: https://www.thehyve.nl
-  - email: joris@thehyve.nl
-    name: Joris Borgdorff
-    url: https://www.thehyve.nl/experts/joris-borgdorff
+  - email: pim@thehyve.nl
+    name: Pim van Nierop
+    url: https://www.thehyve.nl/experts/pim-van-nierop
   - email: [email protected]
     name: Nivethika Mahasivam
     url: https://www.thehyve.nl/experts/nivethika-mahasivam

charts/radar-output/README.md

@@ -3,7 +3,7 @@
 # radar-output
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-output)](https://artifacthub.io/packages/helm/radar-base/radar-output)
 
-![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
+![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.1](https://img.shields.io/badge/AppVersion-3.0.1-informational?style=flat-square)
 
 A Helm chart for RADAR-base output restructure service. This application reads data from intermediate storage and restructure the data into project-> subject-id-> data topic -> data split per hour. This service offers few options to choose the source and target of the pipeline.
 
@@ -14,7 +14,7 @@ A Helm chart for RADAR-base output restructure service. This application reads d
 | Name | Email | Url |
 | ---- | ------ | --- |
 | Keyvan Hedayati | <[email protected]> | <https://www.thehyve.nl> |
-| Joris Borgdorff | <joris@thehyve.nl> | <https://www.thehyve.nl/experts/joris-borgdorff> |
+| Pim van Nierop | <pim@thehyve.nl> | <https://www.thehyve.nl/experts/pim-van-nierop> |
 | Nivethika Mahasivam | <[email protected]> | <https://www.thehyve.nl/experts/nivethika-mahasivam> |
 
 ## Source Code
@@ -49,7 +49,7 @@ A Helm chart for RADAR-base output restructure service. This application reads d
 | networkpolicy | object | check `values.yaml` | Network policy defines who can access this application and who this applications has access to |
 | javaOpts | string | `"-Xms400m -Xmx3g"` |  |
 | existingSecret | string | `nil` | Existing secret for storing S3 or Azure credentials. |
-| source.type | string | `"s3"` | Type of the intermediate storage of the RADAR-base pipeline e.g. s3, hdfs |
+| source.type | string | `"s3"` | Type of the intermediate storage of the RADAR-base pipeline (e.g., s3 or azure) |
 | source.s3.endpoint | string | `"http://minio:9000"` | s3 endpoint of the intermediate storage |
 | source.s3.accessToken | string | `"access_key"` | s3 access-key of the intermediate storage |
 | source.s3.secretKey | string | `"secret"` | s3 secret-key of the intermediate storage |
@@ -68,7 +68,7 @@ A Helm chart for RADAR-base output restructure service. This application reads d
 | source.azure.responseTimeout | string | `nil` | Azure HTTP response timeout in seconds |
 | source.azure.writeTimeout | string | `nil` | Azure HTTP write timeout in seconds |
 | source.azure.readTimeout | string | `nil` | Azure HTTP read timeout in seconds |
-| target.type | string | `"s3"` | Type of the output storage of the RADAR-base pipeline e.g. s3, local |
+| target.type | string | `"s3"` | Type of the output storage of the RADAR-base pipeline (e.g., s3 or azure) |
 | target.s3.endpoint | string | `"http://minio:9000"` | s3 endpoint of the output storage |
 | target.s3.accessToken | string | `"access_key"` | s3 access-key of the output storage |
 | target.s3.secretKey | string | `"secret"` | s3 secret-key of the output storage |

charts/radar-output/templates/configmap.yaml

@@ -87,7 +87,7 @@ data:
       # Compression type: none, zip or gzip
       type: {{ .Values.compression.type }}
       # Compression Factory class
-      # factory: org.radarbase.hdfs.data.CompressionFactory
+      # factory: org.radarbase.output.data.CompressionFactory
       # Additional compression properties
       # properties: {}
 
@@ -99,7 +99,7 @@ data:
       deduplication:
         enable: {{ .Values.deduplication.enable }}
       # Format factory class
-      # factory: org.radarbase.hdfs.data.FormatFactory
+      # factory: org.radarbase.output.data.FormatFactory
       # Additional format properties
       # properties: {}
 
@@ -125,7 +125,7 @@ data:
 
     # Path settings
     paths:
-      # Input directories in HDFS
+      # Input directories
       inputs:
         - "{{ .Values.paths.input }}"
       # Root temporary directory for local file processing.

charts/radar-output/templates/deployment.yaml

@@ -57,7 +57,7 @@ spec:
             - -F
             - /etc/radar-output/config.yaml
           env:
-          - name: RADAR_HDFS_RESTRUCTURE_OPTS
+          - name: RADAR_OUTPUT_RESTRUCTURE_OPTS
             value: {{ .Values.javaOpts  | quote }}
           - name: SOURCE_S3_ACCESS_TOKEN
             valueFrom:

charts/radar-output/values.yaml

@@ -109,7 +109,7 @@ javaOpts: "-Xms400m -Xmx3g"
 existingSecret:
 
 source:
-  # -- Type of the intermediate storage of the RADAR-base pipeline e.g. s3, hdfs
+  # -- Type of the intermediate storage of the RADAR-base pipeline (e.g., s3 or azure)
   type: s3
   s3:
     # -- s3 endpoint of the intermediate storage
@@ -151,7 +151,7 @@ source:
     readTimeout:
 
 target:
-  # -- Type of the output storage of the RADAR-base pipeline e.g. s3, local
+  # -- Type of the output storage of the RADAR-base pipeline (e.g., s3 or azure)
   type: s3
   s3:
     # -- s3 endpoint of the output storage