Skip to content

San 6323 fix crons #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
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.

[//]: # (Let's get your best description here about what's happend! Here's a list as well, if you like:)

* I removed this function
Expand Down
26 changes: 14 additions & 12 deletions ansible/group_vars/alpha-khronos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@ dockerfile_pre_install_commands: [
'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc'
]

prod_cron_queues:
- cron_queue: canary.build.run
cron_scedule: "*/5 * * * *"
- cron_queue: canary.github-branch.run
cron_scedule: "*/5 * * * *"
- cron_queue: canary.log.run
cron_scedule: "*/5 * * * *"
- cron_queue: canary.network.run
cron_scedule: "*/5 * * * *"
- cron_queue: metrics.container-status
cron_scedule: "*/5 * * * *"
- cron_queue: canary.failover.run
cron_scedule: "*/30 * * * *"

cron_queues:
- cron_queue: containers.image-builder.prune
cron_scedule: "13 1,4,7,10,13,16,19,22 * * *"
Expand All @@ -30,18 +44,6 @@ cron_queues:
cron_scedule: "13 1,4,7,10,13,16,19,22 * * *"
- cron_queue: weave.prune
cron_scedule: "13 1,4,7,10,13,16,19,22 * * *"
- cron_queue: canary.build.run
cron_scedule: "*/5 * * * *"
- cron_queue: canary.github-branch.run
cron_scedule: "*/5 * * * *"
- cron_queue: canary.log.run
cron_scedule: "*/5 * * * *"
- cron_queue: canary.network.run
cron_scedule: "*/5 * * * *"
- cron_queue: metrics.container-status
cron_scedule: "*/5 * * * *"
- cron_queue: canary.failover.run
cron_scedule: "*/30 * * * *"

cron_events:
- cron_event: time.one-day.passed
Expand Down
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/canary.build.run
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: canary-build-run
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue canary.build.run
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue canary.build.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/canary.failover.run
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: canary-failover-run
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue canary.failover.run
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue canary.failover.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/canary.github-branch.run
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: canary-github-branch-run
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue canary.github-branch.run
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue canary.github-branch.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/canary.log.run
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: canary-log-run
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue canary.log.run
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue canary.log.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/canary.network.run
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: canary-network-run
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue canary.network.run
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue canary.network.run --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/containers.image-builder.prune
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: containers-image-builder-prune
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue containers.image-builder.prune
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue containers.image-builder.prune --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/containers.orphan.prune
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: containers-orphan-prune
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue containers.orphan.prune
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue containers.orphan.prune --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/context-versions.prune-expired
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: context-versions-prune-expired
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue context-versions.prune-expired
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue context-versions.prune-expired --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/images.prune
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: images-prune
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue images.prune
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue images.prune --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/instances.cleanup
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: instances-cleanup
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue instances.cleanup
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue instances.cleanup --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/metrics.container-status
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: metrics-container-status
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --queue metrics.container-status
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --queue metrics.container-status --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/time.five-minutes.passed
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: time-five-minutes-passed
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --event time.five-minutes.passed
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --event time.five-minutes.passed --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/time.four-hours.passed
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: time-four-hours-passed
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --event time.four-hours.passed
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --event time.four-hours.passed --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
17 changes: 11 additions & 6 deletions ansible/k8/delta/khronos/crons/time.one-day.passed
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@ spec:
spec:
imagePullSecrets:
- name: runnable-kubernetes-pull-secret
restartPolicy: OnFailure
restartPolicy: Never
containers:
- name: time-one-day-passed
image: quay.io/runnable/khronos:v6.5.12
env:
- name: DATADOG_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: DATADOG_PORT
value: "8125"
args:
- /khronos/bin/cli.js
- --event time.one-day.passed
- --job '{}'
- --host 10.8.4.195:54321
- --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
- bash
- -c
- /khronos/bin/cli.js --event time.one-day.passed --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
Loading