diff --git a/vendor.conf b/vendor.conf index 37e14b22..86176b38 100644 --- a/vendor.conf +++ b/vendor.conf @@ -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 diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go index fdc52f1e..17de0ce9 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go @@ -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 { diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go index a8115be3..4e5974c3 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go @@ -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"),