From a52af44d182826f0e8c62768df5305214f291022 Mon Sep 17 00:00:00 2001 From: Nathan Jenan Date: Tue, 19 Jun 2018 11:14:54 -0700 Subject: [PATCH 1/2] Adding options for EKS clusters Adding region, instance type, and min and max node options to EKS config. Issue: https://github.com/rancher/rancher/issues/14064 --- apis/management.cattle.io/v3/cluster_types.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index fdc52f1e..17de0ce9 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/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 { From 50999848b1c96d897ba09b1ac9b842f84c76a0c5 Mon Sep 17 00:00:00 2001 From: Nathan Jenan Date: Tue, 19 Jun 2018 11:15:03 -0700 Subject: [PATCH 2/2] Generated code --- ..._amazon_elastic_container_service_config.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/client/management/v3/zz_generated_amazon_elastic_container_service_config.go b/client/management/v3/zz_generated_amazon_elastic_container_service_config.go index a0cc458b..52528e67 100644 --- a/client/management/v3/zz_generated_amazon_elastic_container_service_config.go +++ b/client/management/v3/zz_generated_amazon_elastic_container_service_config.go @@ -1,12 +1,20 @@ package client const ( - AmazonElasticContainerServiceConfigType = "amazonElasticContainerServiceConfig" - AmazonElasticContainerServiceConfigFieldAccessKey = "accessKey" - AmazonElasticContainerServiceConfigFieldSecretKey = "secretKey" + AmazonElasticContainerServiceConfigType = "amazonElasticContainerServiceConfig" + AmazonElasticContainerServiceConfigFieldAccessKey = "accessKey" + AmazonElasticContainerServiceConfigFieldInstanceType = "instanceType" + AmazonElasticContainerServiceConfigFieldMaximumNodes = "maximumNodes" + AmazonElasticContainerServiceConfigFieldMinimumNodes = "minimumNodes" + AmazonElasticContainerServiceConfigFieldRegion = "region" + AmazonElasticContainerServiceConfigFieldSecretKey = "secretKey" ) type AmazonElasticContainerServiceConfig struct { - AccessKey string `json:"accessKey,omitempty" yaml:"accessKey,omitempty"` - SecretKey string `json:"secretKey,omitempty" yaml:"secretKey,omitempty"` + AccessKey string `json:"accessKey,omitempty" yaml:"accessKey,omitempty"` + InstanceType string `json:"instanceType,omitempty" yaml:"instanceType,omitempty"` + MaximumNodes int64 `json:"maximumNodes,omitempty" yaml:"maximumNodes,omitempty"` + MinimumNodes int64 `json:"minimumNodes,omitempty" yaml:"minimumNodes,omitempty"` + Region string `json:"region,omitempty" yaml:"region,omitempty"` + SecretKey string `json:"secretKey,omitempty" yaml:"secretKey,omitempty"` }