1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-06 01:10:15 +00:00

update vendor - rancher/types

This commit is contained in:
Jason Greathouse
2019-01-07 13:53:48 -06:00
committed by Alena Prokharchyk
parent 7afa6e927e
commit 934774a798
4 changed files with 13 additions and 6 deletions

View File

@@ -7,3 +7,4 @@
/trash.lock
/types
*trash.lock
.vscode/

View File

@@ -35,7 +35,6 @@ var (
},
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",
"cadvisor-port": "",
},
},
"v1.11": {
@@ -45,6 +44,7 @@ var (
},
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",
"cadvisor-port": "0",
},
},
"v1.10": {
@@ -55,6 +55,7 @@ var (
},
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",
"cadvisor-port": "0",
},
},
"v1.9": {
@@ -62,6 +63,9 @@ var (
"endpoint-reconciler-type": "lease",
"admission-control": "ServiceAccount,NamespaceLifecycle,LimitRanger,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds",
},
Kubelet: map[string]string{
"cadvisor-port": "0",
},
},
}
@@ -709,10 +713,10 @@ var (
"v1.12.4-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.12.4-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.18"),
NginxProxy: m("rancher/rke-tools:v0.1.18"),
CertDownloader: m("rancher/rke-tools:v0.1.18"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.18"),
Alpine: m("rancher/rke-tools:v0.1.20"),
NginxProxy: m("rancher/rke-tools:v0.1.20"),
CertDownloader: m("rancher/rke-tools:v0.1.20"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.20"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"),

View File

@@ -200,6 +200,8 @@ type KubeAPIService struct {
ServiceNodePortRange string `yaml:"service_node_port_range" json:"serviceNodePortRange,omitempty" norman:"default=30000-32767"`
// Enabled/Disable PodSecurityPolicy
PodSecurityPolicy bool `yaml:"pod_security_policy" json:"podSecurityPolicy,omitempty"`
// Enable/Disable AlwaysPullImages admissions plugin
AlwaysPullImages bool `yaml:"always_pull_images" json:"always_pull_images,omitempty"`
}
type KubeControllerService struct {