Merge pull request #1879 from kinarashah/vgm

[2.3] vendor update

go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/mattn/go-colorable v0.1.0
 	github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
 	github.com/pkg/errors v0.8.1
-	github.com/rancher/kontainer-driver-metadata v0.0.0-20200103163853-fc4b583e9322
+	github.com/rancher/kontainer-driver-metadata v0.0.0-20200113180946-882815341981
 	github.com/rancher/norman v0.0.0-20191126011629-6269ccdbeace
 	github.com/rancher/types v0.0.0-20191220141556-ad31d6815bbd
 	github.com/sirupsen/logrus v1.4.2

go.sum

@@ -528,8 +528,8 @@ github.com/prometheus/tsdb v0.8.0/go.mod h1:fSI0j+IUQrDd7+ZtR9WKIGtoYAYAJUKcKhYL
 github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
 github.com/rancher/client-go v1.16.0-rancher.3 h1:bOA0zwtJi8wUeldqfrCGyDRuN6oW+zJ092i/OhWP2nU=
 github.com/rancher/client-go v1.16.0-rancher.3/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200103163853-fc4b583e9322 h1:kcpxOKgMsp7+a6alMhIZTuoHqfSyUCjdsLiheJbg5Bw=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20200103163853-fc4b583e9322/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20200113180946-882815341981 h1:p9hrvFef5NU5oD75AmZHt/+c3zJHvmMa7HRA/nKqu7Q=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20200113180946-882815341981/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
 github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36 h1:N0ZUBJRq/ydy2ULiuqKhmiKShmEtpDOWXxKzVZxTzHk=
 github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
 github.com/rancher/norman v0.0.0-20191126011629-6269ccdbeace h1:ImgHu8QrexwyknSOLFsXjb+WtMd9MC/hk1U2JqdXEQo=

vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/coredns.go

@@ -876,7 +876,7 @@ spec:
           # When cluster is using large nodes(with more cores), "coresPerReplica" should dominate.
           # If using small nodes, "nodesPerReplica" should dominate.
           - --default-params={"linear":{"coresPerReplica":128,"nodesPerReplica":4,"min":1,"preventSinglePointFailure":true}}
-          - --nodelabels=node-role.kubernetes.io/worker=true
+          - --nodelabels=node-role.kubernetes.io/worker=true,beta.kubernetes.io/os=linux
           - --logtostderr=true
           - --v=2
 {{- if eq .RBACConfig "rbac"}}

vendor/modules.txt

@@ -129,7 +129,7 @@ github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/util
 github.com/prometheus/procfs/nfs
 github.com/prometheus/procfs/xfs
-# github.com/rancher/kontainer-driver-metadata v0.0.0-20200103163853-fc4b583e9322
+# github.com/rancher/kontainer-driver-metadata v0.0.0-20200113180946-882815341981
 github.com/rancher/kontainer-driver-metadata/rke
 github.com/rancher/kontainer-driver-metadata/rke/templates
 # github.com/rancher/norman v0.0.0-20191126011629-6269ccdbeace