Merge pull request #36226 from piosz/fluent-manifest

Automatic merge from submit-queue

Made fluentd-gcl config consitent for GCI and ContainerVM

build-tools/lib/release.sh

@@ -307,6 +307,7 @@ 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}"

cluster/addons/gci/README.md

@@ -1,7 +0,0 @@
-Some addons need to be configured slightly differently when running on the
-Google ContainerVM Image (GCI). This directory serves as a place to store yaml
-manifests that need to differ slightly from the ones under
-`cluster/saltbase/salt`.
-
-
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/addons/gci/README.md?pixel)]()

cluster/gce/gci/configure-helper.sh

@@ -1081,7 +1081,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/gci-trusty/gci/fluentd-gcp.yaml" /etc/kubernetes/manifests/
+      cp "${KUBE_HOME}/kube-manifests/kubernetes/fluentd-gcp-gci.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.

cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml

@@ -11,7 +11,7 @@ spec:
   dnsPolicy: Default
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.21
+    image: gcr.io/google_containers/fluentd-gcp:1.25
     command:
       - '/bin/sh'
       - '-c'
@@ -25,7 +25,7 @@ spec:
       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: 80m
+        cpu: 100m
         memory: 200Mi
     volumeMounts:
     - name: varlog

cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml

@@ -1,5 +1,5 @@
 # This config should be kept as similar as possible to the one at
-# cluster/addons/gci/fluentd-gcp.yaml
+# cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml
 apiVersion: v1
 kind: Pod
 metadata: