GPII-3391: New dataloader (orig: Add force_update to gpii-dataloader)

gcp/modules/gpii-dataloader/main.tf

@@ -16,11 +16,7 @@ data "template_file" "dataloader_values" {
 
   vars {
     dataloader_repository = "${var.dataloader_repository}"
-
-    # This is an ugly hack to stop TF/Helm dataloader errors and should be removed
-    # in scope of https://github.com/gpii-ops/gpii-infra/pull/163
-    # dataloader_checksum    = "${var.dataloader_checksum}"
-    dataloader_checksum = "sha256:3876e3526b8b59f94aa25c8b6d1a3166df115d402b51176ef8bd91c899430369"
+    dataloader_checksum   = "${var.dataloader_checksum}"
 
     couchdb_admin_username = "${var.secret_couchdb_admin_username}"
     couchdb_admin_password = "${var.secret_couchdb_admin_password}"
@@ -37,5 +33,6 @@ module "gpii-dataloader" {
   release_values          = ""
   release_values_rendered = "${data.template_file.dataloader_values.rendered}"
 
-  chart_name = "${var.charts_dir}/gpii-dataloader"
+  chart_name   = "${var.charts_dir}/gpii-dataloader"
+  force_update = true
 }

shared/charts/gpii-dataloader/Chart.yaml

@@ -1,5 +1,5 @@
 name: gpii-dataloader
-version: 0.0.1
+version: 0.1.0
 appVersion: 57d0a17da505c8bc28c221c88b8de54447c78dc873c355d0bfd435d28f8b09ee
 home: https://github.com/gpii-ops/gpii-infra
 description: GPII Dataloader Job.

shared/charts/gpii-dataloader/README.md

@@ -46,5 +46,5 @@ Parameter | Description | Default
 --- | --- | ---
 `couchdb_url` | couchdb url for dataloader | `http://admin:[email protected]:5984/gpii`
 `image.repository` | container image repository | `gpii/universal`
-`image.checksum` | container image checksum | `sha256:8547f22ae8e86d7b4b09e10d9ec87b1605b47dc37904171c84555a55462f161e`
+`image.checksum` | container image checksum | `sha256:fa3bbf3a8255be83552da35b84a1a005d5cb3a44627510171a5a5eb11b2aea89`
 `image.pullPolicy` | container image pullPolicy | `IfNotPresent`

shared/charts/gpii-dataloader/templates/job.yaml

@@ -12,9 +12,8 @@ spec:
       containers:
       - name: gpii-dataloader
         image: "{{ .Values.image.repository }}@{{ .Values.image.checksum }}"
+        command: [ '/app/scripts/deleteAndLoadSnapsets.sh' ]
         env:
-        - name: COUCHDB_URL
+        - name: GPII_COUCHDB_URL
           value: '{{ .Values.couchdb_url }}'
-        - name: CLEAR_INDEX
-          value: 'true'
       restartPolicy: OnFailure

shared/charts/gpii-dataloader/values.yaml

@@ -5,8 +5,8 @@
 couchdb_url: "http://admin:[email protected]:5984/gpii"
 
 image:
-  repository: gpii/gpii-dataloader
-  checksum: sha256:f279c6ab7fa1c19e5f358a6a3d87a970eaf8d615c8b6181851fa086b6229b3a1
+  repository: gpii/universal
+  checksum: sha256:652ed9dc86639d51e806356737567336339c9eb675193ba04b2c5346de3bdee6
   pullPolicy: IfNotPresent
 
 nameOverride: dataloader

shared/charts/gpii-flowmanager/values.yaml

@@ -14,7 +14,7 @@ preferences_url: http://preferences.gpii.svc.cluster.local/preferences/%gpiiKey?
 
 image:
   repository: gpii/universal
-  checksum: sha256:8547f22ae8e86d7b4b09e10d9ec87b1605b47dc37904171c84555a55462f161e
+  checksum: sha256:652ed9dc86639d51e806356737567336339c9eb675193ba04b2c5346de3bdee6
   pullPolicy: IfNotPresent
 
 rollingUpdate:

shared/charts/gpii-preferences/values.yaml

@@ -13,7 +13,7 @@ node_env: gpii.config.preferencesServer.standalone.production
 
 image:
   repository: gpii/universal
-  checksum: sha256:8547f22ae8e86d7b4b09e10d9ec87b1605b47dc37904171c84555a55462f161e
+  checksum: sha256:652ed9dc86639d51e806356737567336339c9eb675193ba04b2c5346de3bdee6
   pullPolicy: IfNotPresent
 
 rollingUpdate: