diff --git a/build-tools/lib/release.sh b/build-tools/lib/release.sh index 1467b93cf2..6356436113 100644 --- a/build-tools/lib/release.sh +++ b/build-tools/lib/release.sh @@ -317,7 +317,6 @@ function kube::release::package_kube_manifests_tarball() { cp "${salt_dir}/cluster-autoscaler/cluster-autoscaler.manifest" "${dst_dir}/" cp "${salt_dir}/fluentd-es/fluentd-es.yaml" "${release_stage}/" cp "${salt_dir}/fluentd-gcp/fluentd-gcp.yaml" "${release_stage}/" - cp "${salt_dir}/fluentd-gcp-gci/fluentd-gcp-gci.yaml" "${release_stage}/" cp "${salt_dir}/kube-registry-proxy/kube-registry-proxy.yaml" "${release_stage}/" cp "${salt_dir}/kube-proxy/kube-proxy.manifest" "${release_stage}/" cp "${salt_dir}/etcd/etcd.manifest" "${dst_dir}" diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index fd016b7cdd..cfed3cba48 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1109,7 +1109,7 @@ function start-fluentd { echo "Start fluentd pod" if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]]; then if [[ "${LOGGING_DESTINATION:-}" == "gcp" ]]; then - cp "${KUBE_HOME}/kube-manifests/kubernetes/fluentd-gcp-gci.yaml" /etc/kubernetes/manifests/ + cp "${KUBE_HOME}/kube-manifests/kubernetes/fluentd-gcp.yaml" /etc/kubernetes/manifests/ elif [[ "${LOGGING_DESTINATION:-}" == "elasticsearch" && "${KUBERNETES_MASTER:-}" != "true" ]]; then # Running fluentd-es on the master is pointless, as it can't communicate # with elasticsearch from there in the default configuration. diff --git a/cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml b/cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml deleted file mode 100644 index 893e9aadc5..0000000000 --- a/cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml +++ /dev/null @@ -1,62 +0,0 @@ -# This config should be kept as similar as possible to the one at -# cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml -apiVersion: v1 -kind: Pod -metadata: - name: fluentd-cloud-logging - namespace: kube-system - labels: - k8s-app: fluentd-logging -spec: - dnsPolicy: Default - containers: - - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.28 - command: - - '/bin/sh' - - '-c' - # This is pretty hacky, but ruby relies on libsystemd's native code, and - # the ubuntu:16.04 libsystemd doesn't play nice with the journal on GCI - # hosts. Work around the problem by copying in the host's libsystemd. - - 'rm /lib/x86_64-linux-gnu/libsystemd* && cp /host/lib/libsystemd* /lib/x86_64-linux-gnu/ && /usr/sbin/td-agent -q -c /etc/td-agent/td-agent-journal.conf' - resources: - limits: - memory: 200Mi - requests: - # Any change here should be accompanied by a proportional change in CPU - # requests of other per-node add-ons (e.g. kube-proxy). - cpu: 100m - memory: 200Mi - env: - # Jemalloc is a widely used way to decrease memory consumption - # in Ruby world. It's a better implementation of malloc(3). - - name: "LD_PRELOAD" - value: "/opt/td-agent/embedded/lib/libjemalloc.so" - # This is quite hacky, but forces Ruby GC to be ivoked more often - # resulting in lower memory consumption, which is important for us. - - name: "RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" - value: "0.9" - volumeMounts: - - name: varlog - mountPath: /var/log - - name: varlibdockercontainers - mountPath: /var/lib/docker/containers - readOnly: true - - name: journaldir - mountPath: /var/log/journal - - name: libsystemddir - mountPath: /host/lib - terminationGracePeriodSeconds: 30 - volumes: - - name: varlog - hostPath: - path: /var/log - - name: varlibdockercontainers - hostPath: - path: /var/lib/docker/containers - - name: journaldir - hostPath: - path: /var/log/journal - - name: libsystemddir - hostPath: - path: /usr/lib64 diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml index 39a81ba5c3..8ed611e7b9 100644 --- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml @@ -11,7 +11,7 @@ spec: dnsPolicy: Default containers: - name: fluentd-cloud-logging - image: gcr.io/google_containers/fluentd-gcp:1.28 + image: gcr.io/google_containers/fluentd-gcp:1.29 resources: limits: memory: 200Mi @@ -23,20 +23,14 @@ spec: env: - name: FLUENTD_ARGS value: -q - # Jemalloc is a widely used way to decrease memory consumption - # in Ruby world. It's a better implementation of malloc(3). - - name: "LD_PRELOAD" - value: "/opt/td-agent/embedded/lib/libjemalloc.so" - # This is quite hacky, but forces Ruby GC to be ivoked more often - # resulting in lower memory consumption, which is important for us. - - name: "RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" - value: "0.9" volumeMounts: - name: varlog mountPath: /var/log - name: varlibdockercontainers mountPath: /var/lib/docker/containers readOnly: true + - name: libsystemddir + mountPath: /host/lib terminationGracePeriodSeconds: 30 volumes: - name: varlog @@ -45,4 +39,6 @@ spec: - name: varlibdockercontainers hostPath: path: /var/lib/docker/containers - + - name: libsystemddir + hostPath: + path: /usr/lib64