diff options
| author | Staffan Olsson <staffan@repos.se> | 2017-11-04 15:53:34 +0100 |
|---|---|---|
| committer | Staffan Olsson <staffan@repos.se> | 2017-11-04 15:53:34 +0100 |
| commit | da19538623316da8c5ae623779d96260fdf7dd66 (patch) | |
| tree | 3e41c9260de4b4f6e13e8c14b274e92ee1e105da | |
| parent | 9446d4a9d32af760e1e87b27afa4c0be60fe154f (diff) | |
| parent | 986d10b9c0f4e6c673d71ed9eb5e0a7884eab05d (diff) | |
| download | kubernetes-kafka-da19538623316da8c5ae623779d96260fdf7dd66.tar.gz kubernetes-kafka-da19538623316da8c5ae623779d96260fdf7dd66.tar.bz2 kubernetes-kafka-da19538623316da8c5ae623779d96260fdf7dd66.zip | |
Merge branch 'raw-restart-on-new-files' into 1.8-logs-streaming
| -rw-r--r-- | logs-streaming/logs-kube-kafka-raw.yml (renamed from logs-streaming/logs-kube-kafka.yml) | 16 | ||||
| -rw-r--r-- | logs-streaming/test/logs-raw.yml (renamed from logs-streaming/test/logs-aggregated.yml) | 10 |
2 files changed, 20 insertions, 6 deletions
diff --git a/logs-streaming/logs-kube-kafka.yml b/logs-streaming/logs-kube-kafka-raw.yml index f9d0e8a..28cf3e3 100644 --- a/logs-streaming/logs-kube-kafka.yml +++ b/logs-streaming/logs-kube-kafka-raw.yml @@ -1,18 +1,22 @@ apiVersion: apps/v1beta2 kind: DaemonSet metadata: - name: logs-kafka + name: logs-kafka-raw namespace: kafka spec: selector: matchLabels: k8s-app: logs-kafka + log-wrapping: none + container-delimiters: tail version: v1 kubernetes.io/cluster-service: "true" template: metadata: labels: k8s-app: logs-kafka + log-wrapping: none + container-delimiters: tail version: v1 kubernetes.io/cluster-service: "true" spec: @@ -23,6 +27,7 @@ spec: - sh - -ec - > + find /var/log/containers/ -maxdepth 1 -name *.log | grep -v "/$HOSTNAME" | tee /tmp/start-list; cd /var/log/containers/; tail -n 0 @@ -36,6 +41,15 @@ spec: -z snappy -v -d broker,topic + livenessProbe: + exec: + command: + - /bin/sh + - -c + - find /var/log/containers/ -maxdepth 1 -name *.log | grep -v "/$HOSTNAME" | diff - /tmp/start-list + failureThreshold: 1 + initialDelaySeconds: 5 + periodSeconds: 5 resources: limits: memory: 100Mi diff --git a/logs-streaming/test/logs-aggregated.yml b/logs-streaming/test/logs-raw.yml index 4da336c..dbe9dc1 100644 --- a/logs-streaming/test/logs-aggregated.yml +++ b/logs-streaming/test/logs-raw.yml @@ -1,7 +1,7 @@ --- kind: ConfigMap metadata: - name: test-logs-aggregated + name: logs-raw namespace: test-kafka apiVersion: v1 data: @@ -28,18 +28,18 @@ data: apiVersion: apps/v1beta2 kind: Deployment metadata: - name: test-logs-aggregated + name: logs-raw namespace: test-kafka spec: replicas: 1 selector: matchLabels: - test-target: logs-streaming + test-target: logs-streaming-raw test-type: readiness template: metadata: labels: - test-target: logs-streaming + test-target: logs-streaming-raw test-type: readiness spec: containers: @@ -72,4 +72,4 @@ spec: volumes: - name: config configMap: - name: test-logs-aggregated + name: logs-raw |