Revert "RANCHER-1257 (#80)"

This reverts commit 17da716.

charts/common/Chart.yaml

@@ -15,7 +15,7 @@ type: library
 # 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: 0.1.27
+version: 0.1.26
 
 # 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

charts/mod-bulk-operations/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: 0.1.5
+version: 0.1.4
 
 # 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

charts/mod-bulk-operations/values.yaml

@@ -111,36 +111,34 @@ extraEnv: |
     value: "{{ .Values.dbMaxPoolSize }}"
   - name: JAVA_OPTIONS
     value: {{ .Values.javaOptions }}
-  - name: S3_IS_AWS
-    value: 'true'
   - name: S3_URL
     valueFrom:
       secretKeyRef:
         key: AWS_URL
-        name: s3-mod-bulk-operations-credentials
+        name: s3-credentials
   - name: S3_REGION
     valueFrom:
       secretKeyRef:
         key: AWS_REGION
-        name: s3-mod-bulk-operations-credentials
+        name: s3-credentials
   - name: S3_ACCESS_KEY_ID
     valueFrom:
       secretKeyRef:
         key: AWS_ACCESS_KEY_ID
-        name: s3-mod-bulk-operations-credentials
+        name: s3-credentials
   - name: S3_SECRET_ACCESS_KEY
     valueFrom:
       secretKeyRef:
         key: AWS_SECRET_ACCESS_KEY
-        name: s3-mod-bulk-operations-credentials
+        name: s3-credentials
   - name: S3_BUCKET
     valueFrom:
       secretKeyRef:
         key: AWS_BUCKET
-        name: s3-mod-bulk-operations-credentials
+        name: s3-credentials
 
 # Enable parameters for DB, Kafka or AWS connection. In value set name of secret
-dbConnectParameters: db-connect-modules
+dbConnectParameters: db-connect-modules 
 kafkaConnectParameters: db-connect-modules
 # awsConnectParameters: s3-credentials
 

charts/mod-data-export-spring/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: 0.1.9
+version: 0.1.8
 
 # 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

charts/mod-data-export-spring/values.yaml

@@ -105,13 +105,11 @@ extraEnv: |
     value: "{{ .Values.dbMaxPoolSize }}"
   - name: JAVA_OPTIONS
     value: {{ .Values.javaOptions }}
-  - name: S3_IS_AWS
-    value: 'true'
 
 # Enable parameters for DB, Kafka or AWS connection. In value set name of secret
 dbConnectParameters: db-connect-modules 
 kafkaConnectParameters: db-connect-modules
-awsConnectParameters: s3-mod-data-export-spring
+# awsConnectParameters: s3-credentials
 okapiConnectParameters: db-connect-modules
 systemUser: true
 

charts/mod-data-export-worker/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: 0.1.19
+version: 0.1.18
 
 # 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

charts/mod-data-export-worker/values.yaml

@@ -111,14 +111,12 @@ extraEnv: |
     value: "{{ .Values.dbMaxPoolSize }}"
   - name: JAVA_OPTIONS
     value: {{ .Values.javaOptions }}
-  - name: S3_IS_AWS
-    value: 'true'
 
 # Enable parameters for DB, Kafka or AWS connection. In value set name of secret
-dbConnectParameters: db-connect-modules
+dbConnectParameters: db-connect-modules 
 kafkaConnectParameters: db-connect-modules
-awsConnectParameters: s3-mod-data-export-worker
-localFsBucketParameters: s3-mod-data-export-worker
+awsConnectParameters: s3-credentials
+localFsBucketParameters: s3-credentials
 
 # initContainer:
 #   image: 

charts/mod-data-export/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: 0.1.46
+version: 0.1.45
 
 # 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

charts/mod-data-export/values.yaml

@@ -105,13 +105,11 @@ extraEnv: |
     value: "{{ .Values.dbMaxPoolSize }}"
   - name: JAVA_OPTIONS
     value: {{ .Values.javaOptions }}
-  - name: S3_IS_AWS
-    value: 'true'
 
 # Enable parameters for DB, Kafka or AWS connection. In value set name of secret
 dbConnectParameters: db-connect-modules 
 # kafkaConnectParameters: db-connect-modules
-awsConnectParameters: s3-mod-data-export-new
+awsConnectParameters: s3-credentials-data-export
 
 # initContainer:
 #   image: