Skip to content
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

Convert Fluentd to Cloud Logging pod specs to YAML #8078

Merged
merged 1 commit into from May 11, 2015
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 0 additions & 30 deletions cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.json

This file was deleted.

29 changes: 29 additions & 0 deletions cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -0,0 +1,29 @@
apiVersion: v1beta3
kind: Pod
metadata:
name: fluentd-cloud-logging
spec:
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.5
env:
- name: "FLUENTD_ARGS"
value: "-qq"
volumeMounts:
- name: varlog
mountPath: /varlog
- name: containers
mountPath: /var/lib/docker/containers
- name: token-admin
mountPath: /etc/token-admin
readOnly: true
volumes:
- name: varlog
hostPath:
path: /var/log
- name: containers
hostPath:
path: /var/lib/docker/containers
- name: token-admin
secret:
secretName: token-admin
4 changes: 2 additions & 2 deletions cluster/saltbase/salt/fluentd-gcp/init.sls
@@ -1,6 +1,6 @@
/etc/kubernetes/manifests/fluentd-gcp.json:
/etc/kubernetes/manifests/fluentd-gcp.yaml:
file.managed:
- source: salt://fluentd-gcp/fluentd-gcp.json
- source: salt://fluentd-gcp/fluentd-gcp.yaml
- user: root
- group: root
- mode: 644
Expand Down