1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-06 17:30:20 +00:00

Update rke-tools image

This commit is contained in:
galal-hussein
2018-06-20 20:31:18 +02:00
committed by Denise
parent 1f8113428e
commit 359816533d
3 changed files with 10 additions and 5 deletions

View File

@@ -26,4 +26,4 @@ github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b17
github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5
github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d
github.com/rancher/types e034ea4ecc9f32f97b99a7415873015fb34a0857
github.com/rancher/types e68cd7ed66e08a066db9175d7af2288ed5c1844c

View File

@@ -205,6 +205,11 @@ type AzureKubernetesServiceConfig struct {
type AmazonElasticContainerServiceConfig struct {
AccessKey string `json:"accessKey" norman:"required"`
SecretKey string `json:"secretKey" norman:"required,type=password"`
Region string `json:"region"`
InstanceType string `json:"instanceType"`
MinimumNodes int `json:"minimumNodes"`
MaximumNodes int `json:"maximumNodes"`
}
type ClusterEvent struct {

View File

@@ -239,10 +239,10 @@ var (
"v1.10.3-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
Kubernetes: m("rancher/hyperkube:v1.10.3-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.9"),
NginxProxy: m("rancher/rke-tools:v0.1.9"),
CertDownloader: m("rancher/rke-tools:v0.1.9"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.9"),
Alpine: m("rancher/rke-tools:v0.1.10"),
NginxProxy: m("rancher/rke-tools:v0.1.10"),
CertDownloader: m("rancher/rke-tools:v0.1.10"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.10"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"),