diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 9dc993e1..90cb2744 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -1,6 +1,7 @@ package v3 import ( + kecattleiov1 "github.com/rancher/eks-controller/pkg/apis/ke.cattle.io/v1" projectcattleiov3 "github.com/rancher/types/apis/project.cattle.io/v3" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -2250,6 +2251,11 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { in, out := &in.GenericEngineConfig, &out.GenericEngineConfig *out = (*in).DeepCopy() } + if in.EKSConfig != nil { + in, out := &in.EKSConfig, &out.EKSConfig + *out = new(kecattleiov1.EKSClusterConfigSpec) + (*in).DeepCopyInto(*out) + } in.ClusterTemplateAnswers.DeepCopyInto(&out.ClusterTemplateAnswers) if in.ClusterTemplateQuestions != nil { in, out := &in.ClusterTemplateQuestions, &out.ClusterTemplateQuestions @@ -2382,6 +2388,7 @@ func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) { *out = new(ScheduledClusterScanStatus) **out = **in } + in.EKSStatus.DeepCopyInto(&out.EKSStatus) return } @@ -3214,6 +3221,32 @@ func (in *DynamicSchemaStatus) DeepCopy() *DynamicSchemaStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *EKSStatus) DeepCopyInto(out *EKSStatus) { + *out = *in + if in.GeneratedSubnets != nil { + in, out := &in.GeneratedSubnets, &out.GeneratedSubnets + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.GeneratedSecurityGroups != nil { + in, out := &in.GeneratedSecurityGroups, &out.GeneratedSecurityGroups + *out = make([]string, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EKSStatus. +func (in *EKSStatus) DeepCopy() *EKSStatus { + if in == nil { + return nil + } + out := new(EKSStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ETCDService) DeepCopyInto(out *ETCDService) { *out = *in diff --git a/client/management/v3/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go index c8dd5e21..0ba15041 100644 --- a/client/management/v3/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -36,6 +36,8 @@ const ( ClusterFieldDesiredAuthImage = "desiredAuthImage" ClusterFieldDockerRootDir = "dockerRootDir" ClusterFieldDriver = "driver" + ClusterFieldEKSConfig = "eksConfig" + ClusterFieldEKSStatus = "eksStatus" ClusterFieldEnableClusterAlerting = "enableClusterAlerting" ClusterFieldEnableClusterMonitoring = "enableClusterMonitoring" ClusterFieldEnableNetworkPolicy = "enableNetworkPolicy" @@ -97,6 +99,8 @@ type Cluster struct { DesiredAuthImage string `json:"desiredAuthImage,omitempty" yaml:"desiredAuthImage,omitempty"` DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` Driver string `json:"driver,omitempty" yaml:"driver,omitempty"` + EKSConfig *EKSClusterConfigSpec `json:"eksConfig,omitempty" yaml:"eksConfig,omitempty"` + EKSStatus *EKSStatus `json:"eksStatus,omitempty" yaml:"eksStatus,omitempty"` EnableClusterAlerting bool `json:"enableClusterAlerting,omitempty" yaml:"enableClusterAlerting,omitempty"` EnableClusterMonitoring bool `json:"enableClusterMonitoring,omitempty" yaml:"enableClusterMonitoring,omitempty"` EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_spec.go b/client/management/v3/zz_generated_cluster_spec.go index af95fc1c..2ec8a43b 100644 --- a/client/management/v3/zz_generated_cluster_spec.go +++ b/client/management/v3/zz_generated_cluster_spec.go @@ -16,6 +16,7 @@ const ( ClusterSpecFieldDesiredAuthImage = "desiredAuthImage" ClusterSpecFieldDisplayName = "displayName" ClusterSpecFieldDockerRootDir = "dockerRootDir" + ClusterSpecFieldEKSConfig = "eksConfig" ClusterSpecFieldEnableClusterAlerting = "enableClusterAlerting" ClusterSpecFieldEnableClusterMonitoring = "enableClusterMonitoring" ClusterSpecFieldEnableNetworkPolicy = "enableNetworkPolicy" @@ -45,6 +46,7 @@ type ClusterSpec struct { DesiredAuthImage string `json:"desiredAuthImage,omitempty" yaml:"desiredAuthImage,omitempty"` DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` + EKSConfig *EKSClusterConfigSpec `json:"eksConfig,omitempty" yaml:"eksConfig,omitempty"` EnableClusterAlerting bool `json:"enableClusterAlerting,omitempty" yaml:"enableClusterAlerting,omitempty"` EnableClusterMonitoring bool `json:"enableClusterMonitoring,omitempty" yaml:"enableClusterMonitoring,omitempty"` EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_status.go b/client/management/v3/zz_generated_cluster_status.go index 3491548a..03c37211 100644 --- a/client/management/v3/zz_generated_cluster_status.go +++ b/client/management/v3/zz_generated_cluster_status.go @@ -18,6 +18,7 @@ const ( ClusterStatusFieldConditions = "conditions" ClusterStatusFieldCurrentCisRunName = "currentCisRunName" ClusterStatusFieldDriver = "driver" + ClusterStatusFieldEKSStatus = "eksStatus" ClusterStatusFieldFailedSpec = "failedSpec" ClusterStatusFieldIstioEnabled = "istioEnabled" ClusterStatusFieldLimits = "limits" @@ -46,6 +47,7 @@ type ClusterStatus struct { Conditions []ClusterCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` CurrentCisRunName string `json:"currentCisRunName,omitempty" yaml:"currentCisRunName,omitempty"` Driver string `json:"driver,omitempty" yaml:"driver,omitempty"` + EKSStatus *EKSStatus `json:"eksStatus,omitempty" yaml:"eksStatus,omitempty"` FailedSpec *ClusterSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` IstioEnabled bool `json:"istioEnabled,omitempty" yaml:"istioEnabled,omitempty"` Limits map[string]string `json:"limits,omitempty" yaml:"limits,omitempty"` diff --git a/client/management/v3/zz_generated_eks_cluster_config_spec.go b/client/management/v3/zz_generated_eks_cluster_config_spec.go new file mode 100644 index 00000000..33df2f61 --- /dev/null +++ b/client/management/v3/zz_generated_eks_cluster_config_spec.go @@ -0,0 +1,40 @@ +package client + +const ( + EKSClusterConfigSpecType = "eksClusterConfigSpec" + EKSClusterConfigSpecFieldCloudCredential = "cloudCredential" + EKSClusterConfigSpecFieldDisplayName = "displayName" + EKSClusterConfigSpecFieldImported = "imported" + EKSClusterConfigSpecFieldKmsKey = "kmsKey" + EKSClusterConfigSpecFieldKubernetesVersion = "kubernetesVersion" + EKSClusterConfigSpecFieldLoggingTypes = "loggingTypes" + EKSClusterConfigSpecFieldNodeGroups = "nodeGroups" + EKSClusterConfigSpecFieldPrivateAccess = "privateAccess" + EKSClusterConfigSpecFieldPublicAccess = "publicAccess" + EKSClusterConfigSpecFieldPublicAccessSources = "publicAccessSources" + EKSClusterConfigSpecFieldRegion = "region" + EKSClusterConfigSpecFieldSecretsEncryption = "secretsEncryption" + EKSClusterConfigSpecFieldSecurityGroups = "securityGroups" + EKSClusterConfigSpecFieldServiceRole = "serviceRole" + EKSClusterConfigSpecFieldSubnets = "subnets" + EKSClusterConfigSpecFieldTags = "tags" +) + +type EKSClusterConfigSpec struct { + CloudCredential string `json:"cloudCredential,omitempty" yaml:"cloudCredential,omitempty"` + DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` + Imported *bool `json:"imported,omitempty" yaml:"imported,omitempty"` + KmsKey string `json:"kmsKey,omitempty" yaml:"kmsKey,omitempty"` + KubernetesVersion string `json:"kubernetesVersion,omitempty" yaml:"kubernetesVersion,omitempty"` + LoggingTypes []string `json:"loggingTypes,omitempty" yaml:"loggingTypes,omitempty"` + NodeGroups []NodeGroup `json:"nodeGroups,omitempty" yaml:"nodeGroups,omitempty"` + PrivateAccess bool `json:"privateAccess,omitempty" yaml:"privateAccess,omitempty"` + PublicAccess bool `json:"publicAccess,omitempty" yaml:"publicAccess,omitempty"` + PublicAccessSources []string `json:"publicAccessSources,omitempty" yaml:"publicAccessSources,omitempty"` + Region string `json:"region,omitempty" yaml:"region,omitempty"` + SecretsEncryption bool `json:"secretsEncryption,omitempty" yaml:"secretsEncryption,omitempty"` + SecurityGroups []string `json:"securityGroups,omitempty" yaml:"securityGroups,omitempty"` + ServiceRole string `json:"serviceRole,omitempty" yaml:"serviceRole,omitempty"` + Subnets []string `json:"subnets,omitempty" yaml:"subnets,omitempty"` + Tags map[string]string `json:"tags,omitempty" yaml:"tags,omitempty"` +} diff --git a/client/management/v3/zz_generated_eks_status.go b/client/management/v3/zz_generated_eks_status.go new file mode 100644 index 00000000..cc6993e5 --- /dev/null +++ b/client/management/v3/zz_generated_eks_status.go @@ -0,0 +1,16 @@ +package client + +const ( + EKSStatusType = "eksStatus" + EKSStatusFieldGeneratedSecurityGroups = "generatedSecurityGroups" + EKSStatusFieldGeneratedServiceRole = "generatedServiceRole" + EKSStatusFieldGeneratedSubnets = "generatedSubnets" + EKSStatusFieldGeneratedVirtualNetwork = "generatedVirtualNetwork" +) + +type EKSStatus struct { + GeneratedSecurityGroups []string `json:"generatedSecurityGroups,omitempty" yaml:"generatedSecurityGroups,omitempty"` + GeneratedServiceRole string `json:"generatedServiceRole,omitempty" yaml:"generatedServiceRole,omitempty"` + GeneratedSubnets []string `json:"generatedSubnets,omitempty" yaml:"generatedSubnets,omitempty"` + GeneratedVirtualNetwork string `json:"generatedVirtualNetwork,omitempty" yaml:"generatedVirtualNetwork,omitempty"` +} diff --git a/client/management/v3/zz_generated_node_group.go b/client/management/v3/zz_generated_node_group.go new file mode 100644 index 00000000..786b927c --- /dev/null +++ b/client/management/v3/zz_generated_node_group.go @@ -0,0 +1,34 @@ +package client + +const ( + NodeGroupType = "nodeGroup" + NodeGroupFieldDesiredSize = "desiredSize" + NodeGroupFieldDiskSize = "diskSize" + NodeGroupFieldEc2SshKey = "ec2SshKey" + NodeGroupFieldGpu = "gpu" + NodeGroupFieldInstanceType = "instanceType" + NodeGroupFieldLabels = "labels" + NodeGroupFieldMaxSize = "maxSize" + NodeGroupFieldMinSize = "minSize" + NodeGroupFieldNodegroupName = "nodegroupName" + NodeGroupFieldSourceSecurityGroups = "sourceSecurityGroups" + NodeGroupFieldSubnets = "subnets" + NodeGroupFieldTags = "tags" + NodeGroupFieldVersion = "version" +) + +type NodeGroup struct { + DesiredSize *int64 `json:"desiredSize,omitempty" yaml:"desiredSize,omitempty"` + DiskSize *int64 `json:"diskSize,omitempty" yaml:"diskSize,omitempty"` + Ec2SshKey string `json:"ec2SshKey,omitempty" yaml:"ec2SshKey,omitempty"` + Gpu bool `json:"gpu,omitempty" yaml:"gpu,omitempty"` + InstanceType string `json:"instanceType,omitempty" yaml:"instanceType,omitempty"` + Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` + MaxSize *int64 `json:"maxSize,omitempty" yaml:"maxSize,omitempty"` + MinSize *int64 `json:"minSize,omitempty" yaml:"minSize,omitempty"` + NodegroupName string `json:"nodegroupName,omitempty" yaml:"nodegroupName,omitempty"` + SourceSecurityGroups []string `json:"sourceSecurityGroups,omitempty" yaml:"sourceSecurityGroups,omitempty"` + Subnets []string `json:"subnets,omitempty" yaml:"subnets,omitempty"` + Tags map[string]string `json:"tags,omitempty" yaml:"tags,omitempty"` + Version string `json:"version,omitempty" yaml:"version,omitempty"` +}