diff --git a/vendor.conf b/vendor.conf index 0b8040cd..8d01826b 100644 --- a/vendor.conf +++ b/vendor.conf @@ -30,4 +30,4 @@ github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ad github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/rancher/norman f5744043a6fb81330ee78e4f7a0f04d0ef65c9f1 github.com/rancher/types 7aea84d5544dffdb64113928c30ec7e9289ebc4a -github.com/rancher/kontainer-driver-metadata a6ceb896b4e0b3a0eff3a2f5aac379b7c7d2896a +github.com/rancher/kontainer-driver-metadata 6068605fbaef9eee8f7e1e6522b8323054cc0031 diff --git a/vendor/github.com/rancher/kontainer-driver-metadata/.gitignore b/vendor/github.com/rancher/kontainer-driver-metadata/.gitignore new file mode 100644 index 00000000..60ca151e --- /dev/null +++ b/vendor/github.com/rancher/kontainer-driver-metadata/.gitignore @@ -0,0 +1 @@ +/kontainer-driver-metadata \ No newline at end of file diff --git a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_docker_info.go b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_docker_info.go index 59f7c6fc..94db1379 100644 --- a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_docker_info.go +++ b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_docker_info.go @@ -1,13 +1,13 @@ package rke func loadK8sVersionDockerInfo() map[string][]string { - return map[string][]string{ + return map[string][]string{ "1.8": {"1.11.x", "1.12.x", "1.13.x", "17.03.x"}, - "1.9": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "18.06.x", "18.09.x"}, - "1.10": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "18.06.x", "18.09.x"}, - "1.11": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "18.06.x", "18.09.x"}, - "1.12": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x"}, - "1.13": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x"}, - "1.14": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x"}, - "1.15": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x"},} + "1.9": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "18.06.x", "18.09.x", "19.03.x"}, + "1.10": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "18.06.x", "18.09.x", "19.03.x"}, + "1.11": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "18.06.x", "18.09.x", "19.03.x"}, + "1.12": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"}, + "1.13": {"1.11.x", "1.12.x", "1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"}, + "1.14": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"}, + "1.15": {"1.13.x", "17.03.x", "17.06.x", "17.09.x", "18.06.x", "18.09.x", "19.03.x"}} }