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

Vendor update

Browse Source
This commit is contained in:
galal-hussein 2019-07-30 20:44:08 +02:00 committed by Alena Prokharchyk
parent 0c9462cd80
commit ebb26714a1
2 changed files with 4 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -30,4 +30,4 @@ github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ad
github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
github.com/rancher/norman f5744043a6fb81330ee78e4f7a0f04d0ef65c9f1 github.com/rancher/norman f5744043a6fb81330ee78e4f7a0f04d0ef65c9f1
github.com/rancher/types 45caae4c520880a0164cd220ef2baf9ae96047b1 github.com/rancher/types 45caae4c520880a0164cd220ef2baf9ae96047b1
github.com/rancher/kontainer-driver-metadata fd87d022d11f88d38c2694c79038f03f14adeada github.com/rancher/kontainer-driver-metadata b626495674afbb1e2ba5fd024020014ad970e3d5

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

@ -14,13 +14,6 @@ const (
func loadK8sVersionServiceOptions() map[string]v3.KubernetesServicesOptions { func loadK8sVersionServiceOptions() map[string]v3.KubernetesServicesOptions {
return map[string]v3.KubernetesServicesOptions{ return map[string]v3.KubernetesServicesOptions{
"v1.15.0-rancher1-2": {
KubeAPI: getKubeAPIOptions115WithAuthAPI(),
Kubelet: getKubeletOptions115WithAuthWebhook(),
KubeController: getKubeControllerOptions(),
Kubeproxy: getKubeProxyOptions(),
Scheduler: getSchedulerOptions(),
},
"v1.15": { "v1.15": {
KubeAPI: getKubeAPIOptions115(), KubeAPI: getKubeAPIOptions115(),
Kubelet: getKubeletOptions115(), Kubelet: getKubeletOptions115(),
@ -35,13 +28,6 @@ func loadK8sVersionServiceOptions() map[string]v3.KubernetesServicesOptions {
Kubeproxy: getKubeProxyOptions(), Kubeproxy: getKubeProxyOptions(),
Scheduler: getSchedulerOptions(), Scheduler: getSchedulerOptions(),
}, },
"v1.14.4-rancher1-1": {
KubeAPI: getKubeAPIOptions114WithAuthAPI(),
Kubelet: getKubeletOptions114WithAuthWebhook(),
KubeController: getKubeControllerOptions(),
Kubeproxy: getKubeProxyOptions(),
Scheduler: getSchedulerOptions(),
},
"v1.13": { "v1.13": {
KubeAPI: getKubeAPIOptions(), KubeAPI: getKubeAPIOptions(),
Kubelet: getKubeletOptions(), Kubelet: getKubeletOptions(),
@ -49,13 +35,6 @@ func loadK8sVersionServiceOptions() map[string]v3.KubernetesServicesOptions {
Kubeproxy: getKubeProxyOptions(), Kubeproxy: getKubeProxyOptions(),
Scheduler: getSchedulerOptions(), Scheduler: getSchedulerOptions(),
}, },
"v1.13.8-rancher1-1": {
KubeAPI: getKubeAPIOptions113WithAuthAPI(),
Kubelet: getKubeletOptions113WithAuthWebhook(),
KubeController: getKubeControllerOptions(),
Kubeproxy: getKubeProxyOptions(),
Scheduler: getSchedulerOptions(),
},
"v1.12": { "v1.12": {
KubeAPI: getKubeAPIOptions(), KubeAPI: getKubeAPIOptions(),
Kubelet: getKubeletOptions(), Kubelet: getKubeletOptions(),
@ -103,6 +82,7 @@ func getKubeAPIOptions() map[string]string {
"secure-port": "6443", "secure-port": "6443",
"service-account-lookup": "true", "service-account-lookup": "true",
"storage-backend": "etcd3", "storage-backend": "etcd3",
"runtime-config": "authorization.k8s.io/v1beta1=true",
} }
return data return data
} }
@ -113,19 +93,7 @@ func getKubeAPIOptions19() map[string]string {
return kubeAPIOptions return kubeAPIOptions
} }
func getKubeAPIOptions113WithAuthAPI() map[string]string {
kubeAPIOptions := getKubeAPIOptions()
kubeAPIOptions["runtime-config"] = "authorization.k8s.io/v1beta1=true"
return kubeAPIOptions
}
func getKubeAPIOptions114() map[string]string { func getKubeAPIOptions114() map[string]string {
kubeAPIOptions := getKubeAPIOptions()
kubeAPIOptions["enable-admission-plugins"] = fmt.Sprintf("%s,%s", enableAdmissionPlugins, "Priority")
return kubeAPIOptions
}
func getKubeAPIOptions114WithAuthAPI() map[string]string {
kubeAPIOptions := getKubeAPIOptions() kubeAPIOptions := getKubeAPIOptions()
kubeAPIOptions["enable-admission-plugins"] = fmt.Sprintf("%s,%s", enableAdmissionPlugins, "Priority") kubeAPIOptions["enable-admission-plugins"] = fmt.Sprintf("%s,%s", enableAdmissionPlugins, "Priority")
kubeAPIOptions["runtime-config"] = "authorization.k8s.io/v1beta1=true" kubeAPIOptions["runtime-config"] = "authorization.k8s.io/v1beta1=true"
@ -135,11 +103,6 @@ func getKubeAPIOptions114WithAuthAPI() map[string]string {
func getKubeAPIOptions115() map[string]string { func getKubeAPIOptions115() map[string]string {
kubeAPIOptions := getKubeAPIOptions114() kubeAPIOptions := getKubeAPIOptions114()
kubeAPIOptions["enable-admission-plugins"] = fmt.Sprintf("%s,%s", kubeAPIOptions["enable-admission-plugins"], "TaintNodesByCondition,PersistentVolumeClaimResize") kubeAPIOptions["enable-admission-plugins"] = fmt.Sprintf("%s,%s", kubeAPIOptions["enable-admission-plugins"], "TaintNodesByCondition,PersistentVolumeClaimResize")
return kubeAPIOptions
}
func getKubeAPIOptions115WithAuthAPI() map[string]string {
kubeAPIOptions := getKubeAPIOptions115()
kubeAPIOptions["runtime-config"] = "authorization.k8s.io/v1beta1=true" kubeAPIOptions["runtime-config"] = "authorization.k8s.io/v1beta1=true"
return kubeAPIOptions return kubeAPIOptions
} }
@ -163,33 +126,17 @@ func getKubeletOptions() map[string]string {
"streaming-connection-idle-timeout": "30m", "streaming-connection-idle-timeout": "30m",
"volume-plugin-dir": "/var/lib/kubelet/volumeplugins", "volume-plugin-dir": "/var/lib/kubelet/volumeplugins",
"v": "2", "v": "2",
"authorization-mode": "Webhook",
} }
} }
func getKubeletOptions115() map[string]string { func getKubeletOptions115() map[string]string {
kubeletOptions := getKubeletOptions() kubeletOptions := getKubeletOptions()
kubeletOptions["authorization-mode"] = "Webhook"
delete(kubeletOptions, "allow-privileged") delete(kubeletOptions, "allow-privileged")
return kubeletOptions return kubeletOptions
} }
func getKubeletOptions115WithAuthWebhook() map[string]string {
kubeletOptions := getKubeletOptions115()
kubeletOptions["authorization-mode"] = "Webhook"
return kubeletOptions
}
func getKubeletOptions114WithAuthWebhook() map[string]string {
kubeletOptions := getKubeletOptions()
kubeletOptions["authorization-mode"] = "Webhook"
return kubeletOptions
}
func getKubeletOptions113WithAuthWebhook() map[string]string {
kubeletOptions := getKubeletOptions()
kubeletOptions["authorization-mode"] = "Webhook"
return kubeletOptions
}
func getKubeControllerOptions() map[string]string { func getKubeControllerOptions() map[string]string {
return map[string]string{ return map[string]string{
"address": "0.0.0.0", "address": "0.0.0.0",