1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 00:14:49 +00:00

Vendor update

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

View File

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