rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-31 12:48:45 +00:00
Code Issues Releases Wiki Activity

Add version specific k8s service options

Browse Source
This commit is contained in:
moelsayed
2018-04-11 03:49:43 +02:00
parent 4a8f9a6b72
commit 2d97118a74
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apis/management.cattle.io/v3/k8s_defaults.go
View File

@@ -14,6 +14,11 @@ var (
K8sV110: v110SystemImages,
}
// K8sVersionServiceOptions - service options per k8s version
K8sVersionServiceOptions = map[string]KubernetesServicesOptions{
K8sV110: v110ServiceOptions,
}
// K8SVersionToSystemImages16 - images map for 1.6. Keeping it sepate in case we have to diverge
K8SVersionToSystemImages16 = map[string]RKESystemImages{
K8sV18: v18SystemImages,
@@ -136,4 +141,14 @@ var (
Tiller: "rancher/tiller:v2.8.2",
Dashboard: "rancher/kubernetes-dashboard-amd64:v1.8.3",
}
// v110 service options
v110ServiceOptions = KubernetesServicesOptions{
KubeAPI: map[string]string{
"tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
},
Kubelet: map[string]string{
"tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305",
},
}
)

13
apis/management.cattle.io/v3/rke_types.go
View File

@@ -409,3 +409,16 @@ type FlannelNetworkProvider struct {
type CanalNetworkProvider struct {
}
type KubernetesServicesOptions struct {
// Additional options passed to KubeAPI
KubeAPI map[string]string `json:"kubeapi"`
// Additional options passed to Kubelet
Kubelet map[string]string `json:"kubelet"`
// Additional options passed to Kubeproxy
Kubeproxy map[string]string `json:"kubeproxy"`
// Additional options passed to KubeController
KubeController map[string]string `json:"kubeController"`
// Additional options passed to Scheduler
Scheduler map[string]string `json:"scheduler"`
}