diff --git a/cluster/libvirt-coreos/skydns-rc.yaml b/cluster/libvirt-coreos/skydns-rc.yaml index f31023be21f..c1c045e65a1 100644 --- a/cluster/libvirt-coreos/skydns-rc.yaml +++ b/cluster/libvirt-coreos/skydns-rc.yaml @@ -4,7 +4,7 @@ metadata: labels: k8s-app: skydns name: skydns - namespace: default + namespace: kube-system spec: replicas: ${DNS_REPLICAS} selector: diff --git a/cluster/libvirt-coreos/skydns-svc.yaml b/cluster/libvirt-coreos/skydns-svc.yaml index a5c0610a585..aa2850a2eff 100644 --- a/cluster/libvirt-coreos/skydns-svc.yaml +++ b/cluster/libvirt-coreos/skydns-svc.yaml @@ -4,7 +4,7 @@ metadata: labels: k8s-app: skydns name: skydns - namespace: default + namespace: kube-system spec: portalIP: ${DNS_SERVER_IP} ports: diff --git a/cluster/ubuntu/skydns-rc.yaml.template b/cluster/ubuntu/skydns-rc.yaml.template index 2e989d62f2e..b13ad7c6b79 100644 --- a/cluster/ubuntu/skydns-rc.yaml.template +++ b/cluster/ubuntu/skydns-rc.yaml.template @@ -1,7 +1,7 @@ kind: ReplicationController apiVersion: v1beta1 id: kube-dns -namespace: default +namespace: kube-system labels: k8s-app: kube-dns kubernetes.io/cluster-service: "true" diff --git a/cluster/ubuntu/skydns-svc.yaml.template b/cluster/ubuntu/skydns-svc.yaml.template index 3df270de7dc..6a76b0ac759 100644 --- a/cluster/ubuntu/skydns-svc.yaml.template +++ b/cluster/ubuntu/skydns-svc.yaml.template @@ -1,7 +1,7 @@ kind: Service apiVersion: v1beta1 id: kube-dns -namespace: default +namespace: kube-system protocol: UDP port: 53 portalIP: {{ pillar['dns_server'] }} diff --git a/contrib/logging/fluentd-sidecar-es/Makefile b/contrib/logging/fluentd-sidecar-es/Makefile index fa12920143c..29a94eedb99 100644 --- a/contrib/logging/fluentd-sidecar-es/Makefile +++ b/contrib/logging/fluentd-sidecar-es/Makefile @@ -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) . diff --git a/contrib/logging/fluentd-sidecar-es/README.md b/contrib/logging/fluentd-sidecar-es/README.md index 800bed1fe2b..b7073dc6686 100644 --- a/contrib/logging/fluentd-sidecar-es/README.md +++ b/contrib/logging/fluentd-sidecar-es/README.md @@ -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. diff --git a/contrib/logging/fluentd-sidecar-es/logging-sidecar-example.yaml b/contrib/logging/fluentd-sidecar-es/logging-sidecar-example.yaml index 17279be4fce..bf70515e813 100644 --- a/contrib/logging/fluentd-sidecar-es/logging-sidecar-example.yaml +++ b/contrib/logging/fluentd-sidecar-es/logging-sidecar-example.yaml @@ -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" diff --git a/contrib/logging/fluentd-sidecar-es/td-agent.conf b/contrib/logging/fluentd-sidecar-es/td-agent.conf index 41dd3caf813..cb9fd14ae13 100644 --- a/contrib/logging/fluentd-sidecar-es/td-agent.conf +++ b/contrib/logging/fluentd-sidecar-es/td-agent.conf @@ -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