Merge pull request #46035 from crassirostris/fluentd-config-version-bump

Automatic merge from submit-queue Add version for fluentd-gcp config Fluentd-gcp config should be versioned, because otherwise during the update race can happen and the new pod can mount the old config

Merge pull request #46035 from crassirostris/fluentd-config-version-bump
c4229be7 · Kubernetes Submit Queue · GitHub · 3999de6d · a6ccc895 · c4229be7
Commit c4229be7 authored May 22, 2017 by Kubernetes Submit Queue Committed by GitHub May 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

fluentd-gcp-configmap.yaml cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml +1 -1

fluentd-gcp-ds.yaml cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +1 -1

No files found.
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-configmap.yaml
@@ -415,7 +415,7 @@ data:
      </store>
    </match>
 metadata:
-  name: fluentd-gcp-config
+  name: fluentd-gcp-config-v1.0
  namespace: kube-system
  labels:
    addonmanager.kubernetes.io/mode: Reconcile
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -118,7 +118,7 @@ spec:
          path: /usr/lib64
      - name: config-volume
        configMap:
-          name: fluentd-gcp-config
+          name: fluentd-gcp-config-v1.0
      - name: ssl-certs
        hostPath:
          path: /etc/ssl/certs