mirror of
https://github.com/rancher/rke.git
synced 2025-09-04 00:14:49 +00:00
vendor update kontainer-driver-metadata
This commit is contained in:
committed by
Alena Prokharchyk
parent
f622c8b942
commit
24fe45b113
13
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_windows_service_options.go
generated
vendored
13
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_windows_service_options.go
generated
vendored
@@ -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
1
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/flannel.go
generated
vendored
@@ -317,6 +317,7 @@ data:
|
||||
cni-conf.json: |
|
||||
{
|
||||
"name": "cbr0",
|
||||
"cniVersion":"0.3.1",
|
||||
"plugins": [
|
||||
{
|
||||
"type": "flannel",
|
||||
|
Reference in New Issue
Block a user