From 8e9b2a354e029d60452b0dbc2ed14e70db99cfdd Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Mon, 8 May 2017 10:22:23 -0700 Subject: [PATCH 1/4] fix cron by using bash and adding datadog vars --- ansible/k8/gamma/khronos/crons/canary.build.run | 17 +++++++++++------ .../k8/gamma/khronos/crons/canary.failover.run | 17 +++++++++++------ .../khronos/crons/canary.github-branch.run | 17 +++++++++++------ ansible/k8/gamma/khronos/crons/canary.log.run | 17 +++++++++++------ .../k8/gamma/khronos/crons/canary.network.run | 17 +++++++++++------ .../crons/containers.image-builder.prune | 17 +++++++++++------ .../gamma/khronos/crons/containers.orphan.prune | 17 +++++++++++------ .../crons/context-versions.prune-expired | 17 +++++++++++------ ansible/k8/gamma/khronos/crons/images.prune | 17 +++++++++++------ .../k8/gamma/khronos/crons/instances.cleanup | 17 +++++++++++------ .../khronos/crons/metrics.container-status | 17 +++++++++++------ .../khronos/crons/time.five-minutes.passed | 17 +++++++++++------ .../gamma/khronos/crons/time.four-hours.passed | 17 +++++++++++------ .../k8/gamma/khronos/crons/time.one-day.passed | 17 +++++++++++------ .../gamma/khronos/crons/time.one-hour.passsed | 17 +++++++++++------ .../khronos/crons/time.thirty-minutes.passed | 17 +++++++++++------ ansible/k8/gamma/khronos/crons/weave.prune | 17 +++++++++++------ ansible/roles/khronos/templates/event-cron.yml | 17 +++++++++++------ ansible/roles/khronos/templates/queue-cron.yml | 17 +++++++++++------ .../templates/swarm-cron.yml | 9 ++++++++- 20 files changed, 217 insertions(+), 115 deletions(-) diff --git a/ansible/k8/gamma/khronos/crons/canary.build.run b/ansible/k8/gamma/khronos/crons/canary.build.run index 1c7bc3ce..0a6055d2 100644 --- a/ansible/k8/gamma/khronos/crons/canary.build.run +++ b/ansible/k8/gamma/khronos/crons/canary.build.run @@ -10,13 +10,18 @@ spec: spec: 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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue canary.build.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/canary.failover.run b/ansible/k8/gamma/khronos/crons/canary.failover.run index ee4ccb8e..21ac4ca4 100644 --- a/ansible/k8/gamma/khronos/crons/canary.failover.run +++ b/ansible/k8/gamma/khronos/crons/canary.failover.run @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue canary.failover.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/canary.github-branch.run b/ansible/k8/gamma/khronos/crons/canary.github-branch.run index a185eb1d..46a280a8 100644 --- a/ansible/k8/gamma/khronos/crons/canary.github-branch.run +++ b/ansible/k8/gamma/khronos/crons/canary.github-branch.run @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue canary.github-branch.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/canary.log.run b/ansible/k8/gamma/khronos/crons/canary.log.run index 85379698..61259305 100644 --- a/ansible/k8/gamma/khronos/crons/canary.log.run +++ b/ansible/k8/gamma/khronos/crons/canary.log.run @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue canary.log.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/canary.network.run b/ansible/k8/gamma/khronos/crons/canary.network.run index d8bf4bee..ec4ffc30 100644 --- a/ansible/k8/gamma/khronos/crons/canary.network.run +++ b/ansible/k8/gamma/khronos/crons/canary.network.run @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue canary.network.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/containers.image-builder.prune b/ansible/k8/gamma/khronos/crons/containers.image-builder.prune index 60d32a85..8a449e88 100644 --- a/ansible/k8/gamma/khronos/crons/containers.image-builder.prune +++ b/ansible/k8/gamma/khronos/crons/containers.image-builder.prune @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue containers.image-builder.prune --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/containers.orphan.prune b/ansible/k8/gamma/khronos/crons/containers.orphan.prune index 7ccc2cc6..3879eecc 100644 --- a/ansible/k8/gamma/khronos/crons/containers.orphan.prune +++ b/ansible/k8/gamma/khronos/crons/containers.orphan.prune @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue containers.orphan.prune --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/context-versions.prune-expired b/ansible/k8/gamma/khronos/crons/context-versions.prune-expired index f032fe9a..a2c606e0 100644 --- a/ansible/k8/gamma/khronos/crons/context-versions.prune-expired +++ b/ansible/k8/gamma/khronos/crons/context-versions.prune-expired @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue context-versions.prune-expired --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/images.prune b/ansible/k8/gamma/khronos/crons/images.prune index 48407cfd..9fa95b41 100644 --- a/ansible/k8/gamma/khronos/crons/images.prune +++ b/ansible/k8/gamma/khronos/crons/images.prune @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue images.prune --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/instances.cleanup b/ansible/k8/gamma/khronos/crons/instances.cleanup index 160ce42f..e6c9bb83 100644 --- a/ansible/k8/gamma/khronos/crons/instances.cleanup +++ b/ansible/k8/gamma/khronos/crons/instances.cleanup @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue instances.cleanup --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/metrics.container-status b/ansible/k8/gamma/khronos/crons/metrics.container-status index 1f1f9433..fcb1a01c 100644 --- a/ansible/k8/gamma/khronos/crons/metrics.container-status +++ b/ansible/k8/gamma/khronos/crons/metrics.container-status @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue metrics.container-status --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/time.five-minutes.passed b/ansible/k8/gamma/khronos/crons/time.five-minutes.passed index b7edc1c1..eef76e77 100644 --- a/ansible/k8/gamma/khronos/crons/time.five-minutes.passed +++ b/ansible/k8/gamma/khronos/crons/time.five-minutes.passed @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --event time.five-minutes.passed --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/time.four-hours.passed b/ansible/k8/gamma/khronos/crons/time.four-hours.passed index eb735e7b..1e2beb88 100644 --- a/ansible/k8/gamma/khronos/crons/time.four-hours.passed +++ b/ansible/k8/gamma/khronos/crons/time.four-hours.passed @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --event time.four-hours.passed --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/time.one-day.passed b/ansible/k8/gamma/khronos/crons/time.one-day.passed index 16320f07..6faf3526 100644 --- a/ansible/k8/gamma/khronos/crons/time.one-day.passed +++ b/ansible/k8/gamma/khronos/crons/time.one-day.passed @@ -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 rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --event time.one-day.passed --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/time.one-hour.passsed b/ansible/k8/gamma/khronos/crons/time.one-hour.passsed index d6c2dde7..46491266 100644 --- a/ansible/k8/gamma/khronos/crons/time.one-hour.passsed +++ b/ansible/k8/gamma/khronos/crons/time.one-hour.passsed @@ -10,13 +10,18 @@ spec: spec: imagePullSecrets: - name: runnable-kubernetes-pull-secret - restartPolicy: OnFailure + restartPolicy: Never containers: - name: time-one-hour-passsed 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-hour.passsed - - --job '{}' - - --host rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --event time.one-hour.passsed --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/time.thirty-minutes.passed b/ansible/k8/gamma/khronos/crons/time.thirty-minutes.passed index 70a37abe..50464d49 100644 --- a/ansible/k8/gamma/khronos/crons/time.thirty-minutes.passed +++ b/ansible/k8/gamma/khronos/crons/time.thirty-minutes.passed @@ -10,13 +10,18 @@ spec: spec: imagePullSecrets: - name: runnable-kubernetes-pull-secret - restartPolicy: OnFailure + restartPolicy: Never containers: - name: time-thirty-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.thirty-minutes.passed - - --job '{}' - - --host rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --event time.thirty-minutes.passed --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/weave.prune b/ansible/k8/gamma/khronos/crons/weave.prune index 6748b831..e8f66a3b 100644 --- a/ansible/k8/gamma/khronos/crons/weave.prune +++ b/ansible/k8/gamma/khronos/crons/weave.prune @@ -10,13 +10,18 @@ spec: spec: imagePullSecrets: - name: runnable-kubernetes-pull-secret - restartPolicy: OnFailure + restartPolicy: Never containers: - name: weave-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 weave.prune - - --job '{}' - - --host rabbitmq:5672 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue weave.prune --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/roles/khronos/templates/event-cron.yml b/ansible/roles/khronos/templates/event-cron.yml index 23779671..84dcf93c 100644 --- a/ansible/roles/khronos/templates/event-cron.yml +++ b/ansible/roles/khronos/templates/event-cron.yml @@ -10,13 +10,18 @@ spec: spec: imagePullSecrets: - name: {{ image_pull_secret_name }} - restartPolicy: OnFailure + restartPolicy: Never containers: - name: {{ item.cron_event | replace('.', '-') }} image: {{ container_image }}:{{ container_tag }} + env: + - name: DATADOG_HOST + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: DATADOG_PORT + value: "{{ datadog_port }}" args: - - /khronos/bin/cli.js - - --event {{ item.cron_event }} - - --job '{}' - - --host {{ cron_rabbit_host_address }} - - {{ cron_rabbit_auth }} + - bash + - -c + - /khronos/bin/cli.js --event {{ item.cron_event }} --job '{}' --host {{ cron_rabbit_host_address }} {{ cron_rabbit_auth }} diff --git a/ansible/roles/khronos/templates/queue-cron.yml b/ansible/roles/khronos/templates/queue-cron.yml index 5f5e0cbd..592b6509 100644 --- a/ansible/roles/khronos/templates/queue-cron.yml +++ b/ansible/roles/khronos/templates/queue-cron.yml @@ -10,13 +10,18 @@ spec: spec: imagePullSecrets: - name: {{ image_pull_secret_name }} - restartPolicy: OnFailure + restartPolicy: Never containers: - name: {{ item.cron_queue | replace('.', '-') }} image: {{ container_image }}:{{ container_tag }} + env: + - name: DATADOG_HOST + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: DATADOG_PORT + value: "{{ datadog_port }}" args: - - /khronos/bin/cli.js - - --queue {{ item.cron_queue }} - - --job '{}' - - --host {{ cron_rabbit_host_address }} - - {{ cron_rabbit_auth }} + - bash + - -c + - /khronos/bin/cli.js --queue {{ item.cron_queue }} --job '{}' --host {{ cron_rabbit_host_address }} {{ cron_rabbit_auth }} diff --git a/ansible/roles/swarm-cloudwatch-reporter/templates/swarm-cron.yml b/ansible/roles/swarm-cloudwatch-reporter/templates/swarm-cron.yml index 61e2fa5f..b652f829 100644 --- a/ansible/roles/swarm-cloudwatch-reporter/templates/swarm-cron.yml +++ b/ansible/roles/swarm-cloudwatch-reporter/templates/swarm-cron.yml @@ -10,11 +10,18 @@ spec: spec: imagePullSecrets: - name: {{ image_pull_secret_name }} + restartPolicy: Never containers: - name: {{ name }} image: {{ container_image }}:{{ container_tag }} -{% if container_envs is defined %} env: + - name: DATADOG_HOST + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: DATADOG_PORT + value: "{{ datadog_port }}" +{% if container_envs is defined %} {% for env in container_envs %} {% if env.value != 'ansible_undefined' %} - name: {{ env.name }} From 7b594aae2058c4401b1119fbdb928e029c044baa Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Mon, 8 May 2017 10:34:51 -0700 Subject: [PATCH 2/4] split out prod crons, add dd to reporter --- ansible/group_vars/alpha-khronos.yml | 26 +++++++++--------- .../k8/gamma/khronos/crons/canary.build.run | 27 ------------------- .../gamma/khronos/crons/canary.failover.run | 27 ------------------- .../khronos/crons/canary.github-branch.run | 27 ------------------- ansible/k8/gamma/khronos/crons/canary.log.run | 27 ------------------- .../k8/gamma/khronos/crons/canary.network.run | 27 ------------------- .../khronos/crons/metrics.container-status | 27 ------------------- .../crons/swarm-cloudwatch-reporter | 8 ++++++ ansible/roles/khronos/tasks/main.yml | 7 +++++ 9 files changed, 29 insertions(+), 174 deletions(-) delete mode 100644 ansible/k8/gamma/khronos/crons/canary.build.run delete mode 100644 ansible/k8/gamma/khronos/crons/canary.failover.run delete mode 100644 ansible/k8/gamma/khronos/crons/canary.github-branch.run delete mode 100644 ansible/k8/gamma/khronos/crons/canary.log.run delete mode 100644 ansible/k8/gamma/khronos/crons/canary.network.run delete mode 100644 ansible/k8/gamma/khronos/crons/metrics.container-status diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml index 2f1fbcb7..75fae8d3 100644 --- a/ansible/group_vars/alpha-khronos.yml +++ b/ansible/group_vars/alpha-khronos.yml @@ -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 * * *" @@ -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 diff --git a/ansible/k8/gamma/khronos/crons/canary.build.run b/ansible/k8/gamma/khronos/crons/canary.build.run deleted file mode 100644 index 0a6055d2..00000000 --- a/ansible/k8/gamma/khronos/crons/canary.build.run +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: batch/v2alpha1 -kind: CronJob -metadata: - name: canary.build.run -spec: - schedule: "*/5 * * * *" - jobTemplate: - spec: - template: - spec: - imagePullSecrets: - - name: runnable-kubernetes-pull-secret - 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: - - bash - - -c - - /khronos/bin/cli.js --queue canary.build.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/canary.failover.run b/ansible/k8/gamma/khronos/crons/canary.failover.run deleted file mode 100644 index 21ac4ca4..00000000 --- a/ansible/k8/gamma/khronos/crons/canary.failover.run +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: batch/v2alpha1 -kind: CronJob -metadata: - name: canary.failover.run -spec: - schedule: "*/30 * * * *" - jobTemplate: - spec: - template: - spec: - imagePullSecrets: - - name: runnable-kubernetes-pull-secret - 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: - - bash - - -c - - /khronos/bin/cli.js --queue canary.failover.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/canary.github-branch.run b/ansible/k8/gamma/khronos/crons/canary.github-branch.run deleted file mode 100644 index 46a280a8..00000000 --- a/ansible/k8/gamma/khronos/crons/canary.github-branch.run +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: batch/v2alpha1 -kind: CronJob -metadata: - name: canary.github-branch.run -spec: - schedule: "*/5 * * * *" - jobTemplate: - spec: - template: - spec: - imagePullSecrets: - - name: runnable-kubernetes-pull-secret - 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: - - bash - - -c - - /khronos/bin/cli.js --queue canary.github-branch.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/canary.log.run b/ansible/k8/gamma/khronos/crons/canary.log.run deleted file mode 100644 index 61259305..00000000 --- a/ansible/k8/gamma/khronos/crons/canary.log.run +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: batch/v2alpha1 -kind: CronJob -metadata: - name: canary.log.run -spec: - schedule: "*/5 * * * *" - jobTemplate: - spec: - template: - spec: - imagePullSecrets: - - name: runnable-kubernetes-pull-secret - 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: - - bash - - -c - - /khronos/bin/cli.js --queue canary.log.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/canary.network.run b/ansible/k8/gamma/khronos/crons/canary.network.run deleted file mode 100644 index ec4ffc30..00000000 --- a/ansible/k8/gamma/khronos/crons/canary.network.run +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: batch/v2alpha1 -kind: CronJob -metadata: - name: canary.network.run -spec: - schedule: "*/5 * * * *" - jobTemplate: - spec: - template: - spec: - imagePullSecrets: - - name: runnable-kubernetes-pull-secret - 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: - - bash - - -c - - /khronos/bin/cli.js --queue canary.network.run --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/khronos/crons/metrics.container-status b/ansible/k8/gamma/khronos/crons/metrics.container-status deleted file mode 100644 index fcb1a01c..00000000 --- a/ansible/k8/gamma/khronos/crons/metrics.container-status +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: batch/v2alpha1 -kind: CronJob -metadata: - name: metrics.container-status -spec: - schedule: "*/5 * * * *" - jobTemplate: - spec: - template: - spec: - imagePullSecrets: - - name: runnable-kubernetes-pull-secret - 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: - - bash - - -c - - /khronos/bin/cli.js --queue metrics.container-status --job '{}' --host rabbitmq:5672 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter b/ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter index c2db1756..f9f33755 100644 --- a/ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter +++ b/ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter @@ -10,9 +10,17 @@ spec: spec: imagePullSecrets: - name: runnable-kubernetes-pull-secret + restartPolicy: Never containers: - name: swarm-cloudwatch-reporter image: quay.io/runnable/furry-cactus:v2.0.0 + env: + - name: DATADOG_HOST + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: DATADOG_PORT + value: "8125" args: - npm - start diff --git a/ansible/roles/khronos/tasks/main.yml b/ansible/roles/khronos/tasks/main.yml index 94c4bb99..0c752fc1 100644 --- a/ansible/roles/khronos/tasks/main.yml +++ b/ansible/roles/khronos/tasks/main.yml @@ -10,6 +10,13 @@ src: queue-cron.yml with_items: "{{ cron_queues }}" +- name: create cron_queues + when: node_env=="production-delta" + template: + dest: "{{ cron_jobs_path }}/{{ item.cron_queue }}" + src: queue-cron.yml + with_items: "{{ prod_cron_queues }}" + - name: create cron_events template: dest: "{{ cron_jobs_path }}/{{ item.cron_event }}" From fb9f6b8439b462a365048d4f7bf78093fcf773b0 Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Mon, 8 May 2017 10:37:46 -0700 Subject: [PATCH 3/4] fix prod crons --- ansible/k8/delta/khronos/crons/canary.build.run | 17 +++++++++++------ .../k8/delta/khronos/crons/canary.failover.run | 17 +++++++++++------ .../khronos/crons/canary.github-branch.run | 17 +++++++++++------ ansible/k8/delta/khronos/crons/canary.log.run | 17 +++++++++++------ .../k8/delta/khronos/crons/canary.network.run | 17 +++++++++++------ .../crons/containers.image-builder.prune | 17 +++++++++++------ .../delta/khronos/crons/containers.orphan.prune | 17 +++++++++++------ .../crons/context-versions.prune-expired | 17 +++++++++++------ ansible/k8/delta/khronos/crons/images.prune | 17 +++++++++++------ .../k8/delta/khronos/crons/instances.cleanup | 17 +++++++++++------ .../khronos/crons/metrics.container-status | 17 +++++++++++------ .../khronos/crons/time.five-minutes.passed | 17 +++++++++++------ .../delta/khronos/crons/time.four-hours.passed | 17 +++++++++++------ .../k8/delta/khronos/crons/time.one-day.passed | 17 +++++++++++------ .../delta/khronos/crons/time.one-hour.passsed | 17 +++++++++++------ .../khronos/crons/time.thirty-minutes.passed | 17 +++++++++++------ ansible/k8/delta/khronos/crons/weave.prune | 17 +++++++++++------ 17 files changed, 187 insertions(+), 102 deletions(-) diff --git a/ansible/k8/delta/khronos/crons/canary.build.run b/ansible/k8/delta/khronos/crons/canary.build.run index c96214b7..baf115e2 100644 --- a/ansible/k8/delta/khronos/crons/canary.build.run +++ b/ansible/k8/delta/khronos/crons/canary.build.run @@ -10,13 +10,18 @@ spec: spec: 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 diff --git a/ansible/k8/delta/khronos/crons/canary.failover.run b/ansible/k8/delta/khronos/crons/canary.failover.run index 60143a47..8e4f936e 100644 --- a/ansible/k8/delta/khronos/crons/canary.failover.run +++ b/ansible/k8/delta/khronos/crons/canary.failover.run @@ -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 diff --git a/ansible/k8/delta/khronos/crons/canary.github-branch.run b/ansible/k8/delta/khronos/crons/canary.github-branch.run index f286abec..016792f8 100644 --- a/ansible/k8/delta/khronos/crons/canary.github-branch.run +++ b/ansible/k8/delta/khronos/crons/canary.github-branch.run @@ -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 diff --git a/ansible/k8/delta/khronos/crons/canary.log.run b/ansible/k8/delta/khronos/crons/canary.log.run index cf2db9d4..a59694c0 100644 --- a/ansible/k8/delta/khronos/crons/canary.log.run +++ b/ansible/k8/delta/khronos/crons/canary.log.run @@ -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 diff --git a/ansible/k8/delta/khronos/crons/canary.network.run b/ansible/k8/delta/khronos/crons/canary.network.run index 7384729c..60d31204 100644 --- a/ansible/k8/delta/khronos/crons/canary.network.run +++ b/ansible/k8/delta/khronos/crons/canary.network.run @@ -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 diff --git a/ansible/k8/delta/khronos/crons/containers.image-builder.prune b/ansible/k8/delta/khronos/crons/containers.image-builder.prune index dee67536..236989a0 100644 --- a/ansible/k8/delta/khronos/crons/containers.image-builder.prune +++ b/ansible/k8/delta/khronos/crons/containers.image-builder.prune @@ -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 diff --git a/ansible/k8/delta/khronos/crons/containers.orphan.prune b/ansible/k8/delta/khronos/crons/containers.orphan.prune index 843b9b35..af303edc 100644 --- a/ansible/k8/delta/khronos/crons/containers.orphan.prune +++ b/ansible/k8/delta/khronos/crons/containers.orphan.prune @@ -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 diff --git a/ansible/k8/delta/khronos/crons/context-versions.prune-expired b/ansible/k8/delta/khronos/crons/context-versions.prune-expired index a4898cff..b6992d81 100644 --- a/ansible/k8/delta/khronos/crons/context-versions.prune-expired +++ b/ansible/k8/delta/khronos/crons/context-versions.prune-expired @@ -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 diff --git a/ansible/k8/delta/khronos/crons/images.prune b/ansible/k8/delta/khronos/crons/images.prune index 0b7ba9fb..76847b2f 100644 --- a/ansible/k8/delta/khronos/crons/images.prune +++ b/ansible/k8/delta/khronos/crons/images.prune @@ -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 diff --git a/ansible/k8/delta/khronos/crons/instances.cleanup b/ansible/k8/delta/khronos/crons/instances.cleanup index 3a4ebb06..75242c09 100644 --- a/ansible/k8/delta/khronos/crons/instances.cleanup +++ b/ansible/k8/delta/khronos/crons/instances.cleanup @@ -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 diff --git a/ansible/k8/delta/khronos/crons/metrics.container-status b/ansible/k8/delta/khronos/crons/metrics.container-status index 1d2e1e76..0fd54874 100644 --- a/ansible/k8/delta/khronos/crons/metrics.container-status +++ b/ansible/k8/delta/khronos/crons/metrics.container-status @@ -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 diff --git a/ansible/k8/delta/khronos/crons/time.five-minutes.passed b/ansible/k8/delta/khronos/crons/time.five-minutes.passed index 8362be94..7aae8bda 100644 --- a/ansible/k8/delta/khronos/crons/time.five-minutes.passed +++ b/ansible/k8/delta/khronos/crons/time.five-minutes.passed @@ -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 diff --git a/ansible/k8/delta/khronos/crons/time.four-hours.passed b/ansible/k8/delta/khronos/crons/time.four-hours.passed index d99e099f..7d1d49cd 100644 --- a/ansible/k8/delta/khronos/crons/time.four-hours.passed +++ b/ansible/k8/delta/khronos/crons/time.four-hours.passed @@ -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 diff --git a/ansible/k8/delta/khronos/crons/time.one-day.passed b/ansible/k8/delta/khronos/crons/time.one-day.passed index 69ddfda3..af28d52e 100644 --- a/ansible/k8/delta/khronos/crons/time.one-day.passed +++ b/ansible/k8/delta/khronos/crons/time.one-day.passed @@ -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 diff --git a/ansible/k8/delta/khronos/crons/time.one-hour.passsed b/ansible/k8/delta/khronos/crons/time.one-hour.passsed index d6ba6653..2bf418d4 100644 --- a/ansible/k8/delta/khronos/crons/time.one-hour.passsed +++ b/ansible/k8/delta/khronos/crons/time.one-hour.passsed @@ -10,13 +10,18 @@ spec: spec: imagePullSecrets: - name: runnable-kubernetes-pull-secret - restartPolicy: OnFailure + restartPolicy: Never containers: - name: time-one-hour-passsed 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-hour.passsed - - --job '{}' - - --host 10.8.4.195:54321 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --event time.one-hour.passsed --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/delta/khronos/crons/time.thirty-minutes.passed b/ansible/k8/delta/khronos/crons/time.thirty-minutes.passed index cac9fb38..41fa535a 100644 --- a/ansible/k8/delta/khronos/crons/time.thirty-minutes.passed +++ b/ansible/k8/delta/khronos/crons/time.thirty-minutes.passed @@ -10,13 +10,18 @@ spec: spec: imagePullSecrets: - name: runnable-kubernetes-pull-secret - restartPolicy: OnFailure + restartPolicy: Never containers: - name: time-thirty-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.thirty-minutes.passed - - --job '{}' - - --host 10.8.4.195:54321 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --event time.thirty-minutes.passed --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk diff --git a/ansible/k8/delta/khronos/crons/weave.prune b/ansible/k8/delta/khronos/crons/weave.prune index 6027e3a5..a14bd16d 100644 --- a/ansible/k8/delta/khronos/crons/weave.prune +++ b/ansible/k8/delta/khronos/crons/weave.prune @@ -10,13 +10,18 @@ spec: spec: imagePullSecrets: - name: runnable-kubernetes-pull-secret - restartPolicy: OnFailure + restartPolicy: Never containers: - name: weave-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 weave.prune - - --job '{}' - - --host 10.8.4.195:54321 - - --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk + - bash + - -c + - /khronos/bin/cli.js --queue weave.prune --job '{}' --host 10.8.4.195:54321 --username o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM --password wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk From 3604fcbb9d384db978c1f9225ed1d4a064178365 Mon Sep 17 00:00:00 2001 From: Anandkumar Patel Date: Mon, 8 May 2017 17:35:22 -0700 Subject: [PATCH 4/4] update PR page to include message --- PULL_REQUEST_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 4cda39ab..56fa638e 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -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