rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-05 17:00:20 +00:00
Code Issues Releases Wiki Activity

vendor update kontainer-driver-metadata

Browse Source
This commit is contained in:
kinarashah
2019-09-11 10:07:23 -07:00
committed by Alena Prokharchyk
parent f622c8b942
commit 24fe45b113
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -32,7 +32,7 @@ require (
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v0.0.0-20170929214853-7c889fafd04a // indirect
github.com/pkg/errors v0.8.1
github.com/rancher/kontainer-driver-metadata v0.0.0-20190910205335-4cf9a4fac46a
github.com/rancher/kontainer-driver-metadata v0.0.0-20190911170536-f9acf8fc853c
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0
github.com/rancher/types v0.0.0-20190827214052-704648244586
github.com/sirupsen/logrus v1.4.2

4
go.sum
View File

@@ -181,8 +181,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190910205335-4cf9a4fac46a h1:+RwE0OhSR2bgySTq8wgso+r+QFc2veWfFnCriB0CO6M=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190910205335-4cf9a4fac46a/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190911170536-f9acf8fc853c h1:NuDSdAaMqU7KTMQ6pzyMG4EQefhvAUlvudIjDcCIVWM=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190911170536-f9acf8fc853c/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0 h1:bNG4b0CTTBE8yEamIz8RYcfz+7kfK9N8YTvyiykRCS8=
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0/go.mod h1:KwP6RD4rVMdK8XK0wqZaptrhTn/TO4kXU3doh4iatQU=
github.com/rancher/types v0.0.0-20190822170951-b99efa820bc3 h1:4mz/J0iEtW/VDtjN3zI9B4g49MKeoLHkHZKJGqRN7xg=

13
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_windows_service_options.go generated vendored
View File

@@ -7,6 +7,10 @@ import (
func loadK8sVersionWindowsServiceOptions() map[string]v3.KubernetesServicesOptions {
// since 1.14, windows has been supported
return map[string]v3.KubernetesServicesOptions{
"v1.16": {
Kubelet: getWindowsKubeletOptions116(),
Kubeproxy: getWindowsKubeProxyOptions(),
},
"v1.15": {
Kubelet: getWindowsKubeletOptions115(),
Kubeproxy: getWindowsKubeProxyOptions(),
@@ -52,6 +56,15 @@ func getWindowsKubeletOptions115() map[string]string {
return kubeletOptions
}
func getWindowsKubeletOptions116() map[string]string {
kubeletOptions := getWindowsKubeletOptions()
// doesn't support `allow-privileged`
delete(kubeletOptions, "allow-privileged")
return kubeletOptions
}
func getWindowsKubeProxyOptions() map[string]string {
kubeProxyOptions := getKubeProxyOptions()

1
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/flannel.go generated vendored
View File

@@ -317,6 +317,7 @@ data:
cni-conf.json: |
{
"name": "cbr0",
"cniVersion":"0.3.1",
"plugins": [
{
"type": "flannel",

2
vendor/modules.txt vendored
View File

@@ -105,7 +105,7 @@ github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
# github.com/prometheus/procfs v0.0.3
github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs
# github.com/rancher/kontainer-driver-metadata v0.0.0-20190910205335-4cf9a4fac46a
# github.com/rancher/kontainer-driver-metadata v0.0.0-20190911170536-f9acf8fc853c
github.com/rancher/kontainer-driver-metadata/rke/templates
github.com/rancher/kontainer-driver-metadata/rke
# github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0