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

Change config files to kube-system which were missed in the original PR #10817

Merged
merged 1 commit into from
Jul 7, 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
2 changes: 1 addition & 1 deletion cluster/libvirt-coreos/skydns-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
k8s-app: skydns
name: skydns
namespace: default
namespace: kube-system
spec:
replicas: ${DNS_REPLICAS}
selector:
Expand Down
2 changes: 1 addition & 1 deletion cluster/libvirt-coreos/skydns-svc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
k8s-app: skydns
name: skydns
namespace: default
namespace: kube-system
spec:
portalIP: ${DNS_SERVER_IP}
ports:
Expand Down
2 changes: 1 addition & 1 deletion cluster/ubuntu/skydns-rc.yaml.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kind: ReplicationController
apiVersion: v1beta1
id: kube-dns
namespace: default
namespace: kube-system
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't do any harm, but these v1beta1 yaml files are completely broken at this point.

labels:
k8s-app: kube-dns
kubernetes.io/cluster-service: "true"
Expand Down
2 changes: 1 addition & 1 deletion cluster/ubuntu/skydns-svc.yaml.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kind: Service
apiVersion: v1beta1
id: kube-dns
namespace: default
namespace: kube-system
protocol: UDP
port: 53
portalIP: {{ pillar['dns_server'] }}
Expand Down
2 changes: 1 addition & 1 deletion contrib/logging/fluentd-sidecar-es/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: build push

TAG = 1.0
TAG = 1.1

build:
docker build -t gcr.io/google_containers/fluentd-sidecar-es:$(TAG) .
Expand Down
2 changes: 1 addition & 1 deletion contrib/logging/fluentd-sidecar-es/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This shouldn't be necessary if your container writes its logs to stdout or stder

In order to make this work, you have to add a few things to your pod config:

1. A second container, using the `gcr.io/google_containers/fluentd-sidecar-es:1.0` image to send the logs to Elasticsearch.
1. A second container, using the `gcr.io/google_containers/fluentd-sidecar-es:1.1` image to send the logs to Elasticsearch.
2. A volume for the two containers to share. The emptyDir volume type is a good choice for this because we only want the volume to exist for the lifetime of the pod.
3. Mount paths for the volume in each container. In your primary container, this should be the path that the applications log files are written to. In the secondary container, this can be just about anything, so we put it under /mnt/log to keep it out of the way of the rest of the filesystem.
4. The `FILES_TO_COLLECT` environment variable in the sidecar container, telling it which files to collect logs from. These paths should always be in the mounted volume.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
- name: log-storage
mountPath: /var/log
- name: sidecar-log-collector
image: gcr.io/google_containers/fluentd-sidecar-es:1.0
image: gcr.io/google_containers/fluentd-sidecar-es:1.1
env:
- name: FILES_TO_COLLECT
value: "/mnt/log/synthetic-count.log /mnt/log/synthetic-dates.log"
Expand Down
2 changes: 1 addition & 1 deletion contrib/logging/fluentd-sidecar-es/td-agent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
type elasticsearch
log_level info
include_tag_key true
host elasticsearch-logging.default
host elasticsearch-logging.kube-system
port 9200
logstash_format true
flush_interval 5s
Expand Down