-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #195 from ropable/master
Refactor tracking views, add unit tests, refactor harvest functions & Kustomize overlays
- Loading branch information
Showing
32 changed files
with
802 additions
and
449 deletions.
There are no files selected for viewing
9 changes: 2 additions & 7 deletions
9
kustomize/overlays/prod/cronjobs/harvest-dfes/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../../../template | ||
| - ../../../../template | ||
| nameSuffix: -harvest-dfes | ||
| patches: | ||
| - target: | ||
| group: batch | ||
| version: v1 | ||
| kind: CronJob | ||
| name: resourcetracking-cronjob | ||
| path: patch.yaml | ||
| - path: patch.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,35 @@ | ||
| - op: replace | ||
| path: /spec/schedule | ||
| value: "* * * * *" | ||
| - op: replace | ||
| path: /spec/jobTemplate/spec/template/spec/containers/0/args | ||
| value: ["manage.py", "harvest_dfes_feed"] | ||
| apiVersion: batch/v1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: resourcetracking-cronjob | ||
| spec: | ||
| schedule: "* * * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: resourcetracking-cronjob | ||
| imagePullPolicy: Always | ||
| args: ["manage.py", "harvest_dfes_feed"] | ||
| env: | ||
| - name: DATABASE_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: DATABASE_URL | ||
| - name: DFES_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: DFES_URL | ||
| - name: DFES_USER | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: DFES_USER | ||
| - name: DFES_PASS | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: DFES_PASS |
12 changes: 0 additions & 12 deletions
12
kustomize/overlays/prod/cronjobs/harvest-email-dplus/kustomization.yaml
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
kustomize/overlays/prod/cronjobs/harvest-email-dplus/patch.yaml
This file was deleted.
Oops, something went wrong.
9 changes: 2 additions & 7 deletions
9
kustomize/overlays/prod/cronjobs/harvest-email-iriditrak/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../../../template | ||
| - ../../../../template | ||
| nameSuffix: -harvest-iriditrak | ||
| patches: | ||
| - target: | ||
| group: batch | ||
| version: v1 | ||
| kind: CronJob | ||
| name: resourcetracking-cronjob | ||
| path: patch.yaml | ||
| - path: patch.yaml |
41 changes: 35 additions & 6 deletions
41
kustomize/overlays/prod/cronjobs/harvest-email-iriditrak/patch.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,35 @@ | ||
| - op: replace | ||
| path: /spec/schedule | ||
| value: "* * * * *" | ||
| - op: replace | ||
| path: /spec/jobTemplate/spec/template/spec/containers/0/args | ||
| value: ["manage.py", "harvest_tracking_email", "--device-type", "iriditrak"] | ||
| apiVersion: batch/v1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: resourcetracking-cronjob | ||
| spec: | ||
| schedule: "* * * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: resourcetracking-cronjob | ||
| imagePullPolicy: Always | ||
| args: ["manage.py", "harvest_tracking_email", "--device-type", "iriditrak", "--purge-email"] | ||
| env: | ||
| - name: DATABASE_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: DATABASE_URL | ||
| - name: EMAIL_HOST | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_HOST | ||
| - name: EMAIL_USER | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_USER | ||
| - name: EMAIL_PASSWORD | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_PASSWORD |
9 changes: 2 additions & 7 deletions
9
kustomize/overlays/prod/cronjobs/harvest-email-mp70/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../../../template | ||
| - ../../../../template | ||
| nameSuffix: -harvest-mp70 | ||
| patches: | ||
| - target: | ||
| group: batch | ||
| version: v1 | ||
| kind: CronJob | ||
| name: resourcetracking-cronjob | ||
| path: patch.yaml | ||
| - path: patch.yaml |
41 changes: 35 additions & 6 deletions
41
kustomize/overlays/prod/cronjobs/harvest-email-mp70/patch.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,35 @@ | ||
| - op: replace | ||
| path: /spec/schedule | ||
| value: "* * * * *" | ||
| - op: replace | ||
| path: /spec/jobTemplate/spec/template/spec/containers/0/args | ||
| value: ["manage.py", "harvest_tracking_email", "--device-type", "mp70"] | ||
| apiVersion: batch/v1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: resourcetracking-cronjob | ||
| spec: | ||
| schedule: "* * * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: resourcetracking-cronjob | ||
| imagePullPolicy: Always | ||
| args: ["manage.py", "harvest_tracking_email", "--device-type", "mp70", "--purge-email"] | ||
| env: | ||
| - name: DATABASE_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: DATABASE_URL | ||
| - name: EMAIL_HOST | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_HOST | ||
| - name: EMAIL_USER | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_USER | ||
| - name: EMAIL_PASSWORD | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_PASSWORD |
9 changes: 2 additions & 7 deletions
9
kustomize/overlays/prod/cronjobs/harvest-email-spot/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../../../template | ||
| - ../../../../template | ||
| nameSuffix: -harvest-spot | ||
| patches: | ||
| - target: | ||
| group: batch | ||
| version: v1 | ||
| kind: CronJob | ||
| name: resourcetracking-cronjob | ||
| path: patch.yaml | ||
| - path: patch.yaml |
41 changes: 35 additions & 6 deletions
41
kustomize/overlays/prod/cronjobs/harvest-email-spot/patch.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,35 @@ | ||
| - op: replace | ||
| path: /spec/schedule | ||
| value: "* * * * *" | ||
| - op: replace | ||
| path: /spec/jobTemplate/spec/template/spec/containers/0/args | ||
| value: ["manage.py", "harvest_tracking_email", "--device-type", "spot"] | ||
| apiVersion: batch/v1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: resourcetracking-cronjob | ||
| spec: | ||
| schedule: "* * * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: resourcetracking-cronjob | ||
| imagePullPolicy: Always | ||
| args: ["manage.py", "harvest_tracking_email", "--device-type", "spot", "--purge-email"] | ||
| env: | ||
| - name: DATABASE_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: DATABASE_URL | ||
| - name: EMAIL_HOST | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_HOST | ||
| - name: EMAIL_USER | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_USER | ||
| - name: EMAIL_PASSWORD | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: EMAIL_PASSWORD |
9 changes: 2 additions & 7 deletions
9
kustomize/overlays/prod/cronjobs/harvest-tracplus/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../../../template | ||
| - ../../../../template | ||
| nameSuffix: -harvest-tracplus | ||
| patches: | ||
| - target: | ||
| group: batch | ||
| version: v1 | ||
| kind: CronJob | ||
| name: resourcetracking-cronjob | ||
| path: patch.yaml | ||
| - path: patch.yaml |
31 changes: 25 additions & 6 deletions
31
kustomize/overlays/prod/cronjobs/harvest-tracplus/patch.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,25 @@ | ||
| - op: replace | ||
| path: /spec/schedule | ||
| value: "* * * * *" | ||
| - op: replace | ||
| path: /spec/jobTemplate/spec/template/spec/containers/0/args | ||
| value: ["manage.py", "harvest_tracplus"] | ||
| apiVersion: batch/v1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: resourcetracking-cronjob | ||
| spec: | ||
| schedule: "* * * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: resourcetracking-cronjob | ||
| imagePullPolicy: Always | ||
| args: ["manage.py", "harvest_tracplus"] | ||
| env: | ||
| - name: DATABASE_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: DATABASE_URL | ||
| - name: TRACPLUS_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-prod | ||
| key: TRACPLUS_URL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
kustomize/overlays/uat/cronjobs/harvest-dfes/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../../../template | ||
| nameSuffix: -harvest-dfes | ||
| patches: | ||
| - path: patch.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| apiVersion: batch/v1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: resourcetracking-cronjob | ||
| spec: | ||
| schedule: "* * * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: resourcetracking-cronjob | ||
| imagePullPolicy: Always | ||
| args: ["manage.py", "harvest_dfes_feed"] | ||
| env: | ||
| - name: DATABASE_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-uat | ||
| key: DATABASE_URL | ||
| - name: DFES_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-uat | ||
| key: DFES_URL | ||
| - name: DFES_USER | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-uat | ||
| key: DFES_USER | ||
| - name: DFES_PASS | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-uat | ||
| key: DFES_PASS |
7 changes: 7 additions & 0 deletions
7
kustomize/overlays/uat/cronjobs/harvest-email-iriditrak/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../../../template | ||
| nameSuffix: -harvest-email-iriditrak | ||
| patches: | ||
| - path: patch.yaml |
35 changes: 35 additions & 0 deletions
35
kustomize/overlays/uat/cronjobs/harvest-email-iriditrak/patch.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| apiVersion: batch/v1 | ||
| kind: CronJob | ||
| metadata: | ||
| name: resourcetracking-cronjob | ||
| spec: | ||
| schedule: "* * * * *" | ||
| jobTemplate: | ||
| spec: | ||
| template: | ||
| spec: | ||
| containers: | ||
| - name: resourcetracking-cronjob | ||
| imagePullPolicy: Always | ||
| args: ["manage.py", "harvest_tracking_email", "--device-type", "iriditrak"] | ||
| env: | ||
| - name: DATABASE_URL | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-uat | ||
| key: DATABASE_URL | ||
| - name: EMAIL_HOST | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-uat | ||
| key: EMAIL_HOST | ||
| - name: EMAIL_USER | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-uat | ||
| key: EMAIL_USER | ||
| - name: EMAIL_PASSWORD | ||
| valueFrom: | ||
| secretKeyRef: | ||
| name: resourcetracking-env-uat | ||
| key: EMAIL_PASSWORD |
7 changes: 7 additions & 0 deletions
7
kustomize/overlays/uat/cronjobs/harvest-email-mp70/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../../../../template | ||
| nameSuffix: -harvest-email-mp70 | ||
| patches: | ||
| - path: patch.yaml |
Oops, something went wrong.