From 5de6f26dd21322d39bd9f3be4fd576bded94976c Mon Sep 17 00:00:00 2001 From: Nathan Jenan Date: Mon, 9 Apr 2018 10:22:53 -0700 Subject: [PATCH] Adding EKS driver config Adding EKS config type to cluster spec so that we can post new EKS clusters to the API. Issue: https://github.com/rancher/rancher/issues/12589 --- apis/management.cattle.io/v3/cluster_types.go | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index d16a6ce1..89ece733 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -52,16 +52,17 @@ type Cluster struct { } type ClusterSpec struct { - DisplayName string `json:"displayName"` - Description string `json:"description"` - Internal bool `json:"internal" norman:"nocreate,noupdate"` - DesiredAgentImage string `json:"desiredAgentImage"` - ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" norman:"nocreate,noupdate"` - GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"` - AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"` - RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"` - DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"` - DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" norman:"type=reference[roleTemplate]"` + DisplayName string `json:"displayName"` + Description string `json:"description"` + Internal bool `json:"internal" norman:"nocreate,noupdate"` + DesiredAgentImage string `json:"desiredAgentImage"` + ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" norman:"nocreate,noupdate"` + GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"` + AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty"` + RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"` + AmazonElasticContainerServiceConfig *AmazonElasticContainerServiceConfig `json:"amazonElasticContainerServiceConfig,omitempty"` + DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"` + DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" norman:"type=reference[roleTemplate]"` } type ImportedConfig struct { @@ -193,6 +194,11 @@ type AzureKubernetesServiceConfig struct { ClientSecret string `json:"clientSecret,omitempty" norman:"required,type=password"` } +type AmazonElasticContainerServiceConfig struct { + AccessKey string `json:"accessKey" norman:"required"` + SecretKey string `json:"secretKey" norman:"required,type=password"` +} + type ClusterEvent struct { types.Namespaced v1.Event