Skip to content

Commit ec5758c

Browse files
anandkumarpatelanandkumarpatel
authored
San 6323 fix crons (#656)
* fix cron by using bash and adding datadog vars * split out prod crons, add dd to reporter * fix prod crons * update PR page to include message
1 parent 79d9e90 commit ec5758c

41 files changed

Lines changed: 369 additions & 325 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
We should treat our k8 files as compiled files, since we don't actually (http://blog.andrewray.me/dealing-with-compiled-files-in-git/). We should probably wait some time until we actually have more confidence in our compilation.
2+
13
[//]: # (Let's get your best description here about what's happend! Here's a list as well, if you like:)
24

35
* I removed this function

‎ansible/group_vars/alpha-khronos.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,20 @@ dockerfile_pre_install_commands: [
1717
'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc'
1818
]
1919

20+
prod_cron_queues:
21+
- cron_queue: canary.build.run
22+
cron_scedule: "*/5 * * * *"
23+
- cron_queue: canary.github-branch.run
24+
cron_scedule: "*/5 * * * *"
25+
- cron_queue: canary.log.run
26+
cron_scedule: "*/5 * * * *"
27+
- cron_queue: canary.network.run
28+
cron_scedule: "*/5 * * * *"
29+
- cron_queue: metrics.container-status
30+
cron_scedule: "*/5 * * * *"
31+
- cron_queue: canary.failover.run
32+
cron_scedule: "*/30 * * * *"
33+
2034
cron_queues:
2135
- cron_queue: containers.image-builder.prune
2236
cron_scedule: "13 1,4,7,10,13,16,19,22 * * *"
@@ -30,18 +44,6 @@ cron_queues:
3044
cron_scedule: "13 1,4,7,10,13,16,19,22 * * *"
3145
- cron_queue: weave.prune
3246
cron_scedule: "13 1,4,7,10,13,16,19,22 * * *"
33-
- cron_queue: canary.build.run
34-
cron_scedule: "*/5 * * * *"
35-
- cron_queue: canary.github-branch.run
36-
cron_scedule: "*/5 * * * *"
37-
- cron_queue: canary.log.run
38-
cron_scedule: "*/5 * * * *"
39-
- cron_queue: canary.network.run
40-
cron_scedule: "*/5 * * * *"
41-
- cron_queue: metrics.container-status
42-
cron_scedule: "*/5 * * * *"
43-
- cron_queue: canary.failover.run
44-
cron_scedule: "*/30 * * * *"
4547

4648
cron_events:
4749
- cron_event: time.one-day.passed

‎ansible/k8/delta/khronos/crons/canary.build.run‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ spec:
1010
spec:
1111
imagePullSecrets:
1212
- name: runnable-kubernetes-pull-secret
13-
restartPolicy: OnFailure
13+
restartPolicy: Never
1414
containers:
1515
- name: canary-build-run
1616
image: quay.io/runnable/khronos:v6.5.12
17+
env:
18+
- name: DATADOG_HOST
19+
valueFrom:
20+
fieldRef:
21+
fieldPath: spec.nodeName
22+
- name: DATADOG_PORT
23+
value: "8125"
1724
args:
18-
- /khronos/bin/cli.js
19-
- --queue canary.build.run
20-
- --job '{}'
21-
- --host 10.8.4.195:54321
22-
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
25+
- bash
26+
- -c
27+
- /khronos/bin/cli.js --queue canary.build.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk

‎ansible/k8/delta/khronos/crons/canary.failover.run‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ spec:
1010
spec:
1111
imagePullSecrets:
1212
- name: runnable-kubernetes-pull-secret
13-
restartPolicy: OnFailure
13+
restartPolicy: Never
1414
containers:
1515
- name: canary-failover-run
1616
image: quay.io/runnable/khronos:v6.5.12
17+
env:
18+
- name: DATADOG_HOST
19+
valueFrom:
20+
fieldRef:
21+
fieldPath: spec.nodeName
22+
- name: DATADOG_PORT
23+
value: "8125"
1724
args:
18-
- /khronos/bin/cli.js
19-
- --queue canary.failover.run
20-
- --job '{}'
21-
- --host 10.8.4.195:54321
22-
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
25+
- bash
26+
- -c
27+
- /khronos/bin/cli.js --queue canary.failover.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk

‎ansible/k8/delta/khronos/crons/canary.github-branch.run‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ spec:
1010
spec:
1111
imagePullSecrets:
1212
- name: runnable-kubernetes-pull-secret
13-
restartPolicy: OnFailure
13+
restartPolicy: Never
1414
containers:
1515
- name: canary-github-branch-run
1616
image: quay.io/runnable/khronos:v6.5.12
17+
env:
18+
- name: DATADOG_HOST
19+
valueFrom:
20+
fieldRef:
21+
fieldPath: spec.nodeName
22+
- name: DATADOG_PORT
23+
value: "8125"
1724
args:
18-
- /khronos/bin/cli.js
19-
- --queue canary.github-branch.run
20-
- --job '{}'
21-
- --host 10.8.4.195:54321
22-
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
25+
- bash
26+
- -c
27+
- /khronos/bin/cli.js --queue canary.github-branch.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk

‎ansible/k8/delta/khronos/crons/canary.log.run‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ spec:
1010
spec:
1111
imagePullSecrets:
1212
- name: runnable-kubernetes-pull-secret
13-
restartPolicy: OnFailure
13+
restartPolicy: Never
1414
containers:
1515
- name: canary-log-run
1616
image: quay.io/runnable/khronos:v6.5.12
17+
env:
18+
- name: DATADOG_HOST
19+
valueFrom:
20+
fieldRef:
21+
fieldPath: spec.nodeName
22+
- name: DATADOG_PORT
23+
value: "8125"
1724
args:
18-
- /khronos/bin/cli.js
19-
- --queue canary.log.run
20-
- --job '{}'
21-
- --host 10.8.4.195:54321
22-
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
25+
- bash
26+
- -c
27+
- /khronos/bin/cli.js --queue canary.log.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk

‎ansible/k8/delta/khronos/crons/canary.network.run‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ spec:
1010
spec:
1111
imagePullSecrets:
1212
- name: runnable-kubernetes-pull-secret
13-
restartPolicy: OnFailure
13+
restartPolicy: Never
1414
containers:
1515
- name: canary-network-run
1616
image: quay.io/runnable/khronos:v6.5.12
17+
env:
18+
- name: DATADOG_HOST
19+
valueFrom:
20+
fieldRef:
21+
fieldPath: spec.nodeName
22+
- name: DATADOG_PORT
23+
value: "8125"
1724
args:
18-
- /khronos/bin/cli.js
19-
- --queue canary.network.run
20-
- --job '{}'
21-
- --host 10.8.4.195:54321
22-
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
25+
- bash
26+
- -c
27+
- /khronos/bin/cli.js --queue canary.network.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk

‎ansible/k8/delta/khronos/crons/containers.image-builder.prune‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ spec:
1010
spec:
1111
imagePullSecrets:
1212
- name: runnable-kubernetes-pull-secret
13-
restartPolicy: OnFailure
13+
restartPolicy: Never
1414
containers:
1515
- name: containers-image-builder-prune
1616
image: quay.io/runnable/khronos:v6.5.12
17+
env:
18+
- name: DATADOG_HOST
19+
valueFrom:
20+
fieldRef:
21+
fieldPath: spec.nodeName
22+
- name: DATADOG_PORT
23+
value: "8125"
1724
args:
18-
- /khronos/bin/cli.js
19-
- --queue containers.image-builder.prune
20-
- --job '{}'
21-
- --host 10.8.4.195:54321
22-
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
25+
- bash
26+
- -c
27+
- /khronos/bin/cli.js --queue containers.image-builder.prune --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk

‎ansible/k8/delta/khronos/crons/containers.orphan.prune‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ spec:
1010
spec:
1111
imagePullSecrets:
1212
- name: runnable-kubernetes-pull-secret
13-
restartPolicy: OnFailure
13+
restartPolicy: Never
1414
containers:
1515
- name: containers-orphan-prune
1616
image: quay.io/runnable/khronos:v6.5.12
17+
env:
18+
- name: DATADOG_HOST
19+
valueFrom:
20+
fieldRef:
21+
fieldPath: spec.nodeName
22+
- name: DATADOG_PORT
23+
value: "8125"
1724
args:
18-
- /khronos/bin/cli.js
19-
- --queue containers.orphan.prune
20-
- --job '{}'
21-
- --host 10.8.4.195:54321
22-
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
25+
- bash
26+
- -c
27+
- /khronos/bin/cli.js --queue containers.orphan.prune --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk

‎ansible/k8/delta/khronos/crons/context-versions.prune-expired‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,18 @@ spec:
1010
spec:
1111
imagePullSecrets:
1212
- name: runnable-kubernetes-pull-secret
13-
restartPolicy: OnFailure
13+
restartPolicy: Never
1414
containers:
1515
- name: context-versions-prune-expired
1616
image: quay.io/runnable/khronos:v6.5.12
17+
env:
18+
- name: DATADOG_HOST
19+
valueFrom:
20+
fieldRef:
21+
fieldPath: spec.nodeName
22+
- name: DATADOG_PORT
23+
value: "8125"
1724
args:
18-
- /khronos/bin/cli.js
19-
- --queue context-versions.prune-expired
20-
- --job '{}'
21-
- --host 10.8.4.195:54321
22-
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
25+
- bash
26+
- -c
27+
- /khronos/bin/cli.js --queue context-versions.prune-expired --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk

0 commit comments

Comments
 (0)