Skip to content

Commit

Permalink
feat(eks): add kubernetes network config support
Browse files Browse the repository at this point in the history 
Signed-off-by: liubo02 <liubo02@pingcap.com>
  • Loading branch information
@liubog2008
liubog2008 committed Jan 12, 2023
1 parent 38d1abc commit d13fa49
Show file tree
Hide file tree
Showing 4 changed files with 208 additions and 0 deletions.
83 changes: 83 additions & 0 deletions apis/eks/v1beta1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ type ClusterParameters struct {
// +optional
EncryptionConfig []EncryptionConfig `json:"encryptionConfig,omitempty"`

// The Kubernetes network configuration for the cluster.
// +immutable
// +optional
KubernetesNetworkConfig *KubernetesNetworkConfigRequest `json:"kubernetesNetworkConfig,omitempty"`

// Enable or disable exporting the Kubernetes control plane logs for your cluster
// to CloudWatch Logs. By default, cluster control plane logs aren't exported
// to CloudWatch Logs. For more information, see Amazon EKS Cluster Control
Expand Down Expand Up @@ -151,6 +156,55 @@ type Provider struct {
KeyArn string `json:"keyArn"`
}

// IPFamily specifies the ip family
type IPFamily string

const (
// IPFamilyIpv4 means ipv4
IPFamilyIpv4 IPFamily = "ipv4"
// IPFamilyIpv6 means ipv6
IPFamilyIpv6 IPFamily = "ipv6"
)

// KubernetesNetworkConfigRequest specifies the Kubernetes network configuration for the cluster.
type KubernetesNetworkConfigRequest struct {
// Specify which IP family is used to assign Kubernetes pod and service IP
// addresses. If you don't specify a value, ipv4 is used by default. You can only
// specify an IP family when you create a cluster and can't change this value once
// the cluster is created. If you specify ipv6, the VPC and subnets that you
// specify for cluster creation must have both IPv4 and IPv6 CIDR blocks assigned
// to them. You can't specify ipv6 for clusters in China Regions. You can only
// specify ipv6 for 1.21 and later clusters that use version 1.10.1 or later of the
// Amazon VPC CNI add-on. If you specify ipv6, then ensure that your VPC meets the
// requirements listed in the considerations listed in Assigning IPv6 addresses to
// pods and services
// (https://docs.aws.amazon.com/eks/latest/userguide/cni-ipv6.html) in the Amazon
// EKS User Guide. Kubernetes assigns services IPv6 addresses from the unique local
// address range (fc00::/7). You can't specify a custom IPv6 CIDR block. Pod
// addresses are assigned from the subnet's IPv6 CIDR.
IPFamily IPFamily `json:"ipFamily"`

// Don't specify a value if you select ipv6 for ipFamily. The CIDR block to assign
// Kubernetes service IP addresses from. If you don't specify a block, Kubernetes
// assigns addresses from either the 10.100.0.0/16 or 172.20.0.0/16 CIDR blocks. We
// recommend that you specify a block that does not overlap with resources in other
// networks that are peered or connected to your VPC. The block must meet the
// following requirements:
//
// * Within one of the following private IP address
// blocks: 10.0.0.0/8, 172.16.0.0/12, or 192.168.0.0/16.
//
// * Doesn't overlap with
// any CIDR block assigned to the VPC that you selected for VPC.
//
// * Between /24 and
// /12.
//
// You can only specify a custom CIDR block when you create a cluster and
// can't change this value once the cluster is created.
ServiceIpv4Cidr string `json:"serviceIpv4Cidr,omitempty"`
}

// Logging in the logging configuration for a cluster.
type Logging struct {
// The cluster control plane logging configuration for your cluster.
Expand Down Expand Up @@ -277,6 +331,9 @@ type ClusterObservation struct {
// Amazon Web Services cloud.
OutpostConfig OutpostConfigResponse `json:"outpostConfig,omitempty"`

// The Kubernetes network configuration for the cluster.
KubernetesNetworkConfig KubernetesNetworkConfigResponse `json:"kubernetesNetworkConfig,omitempty"`

// The VPC configuration used by the cluster control plane. Amazon EKS VPC resources
// have specific requirements to work properly with Kubernetes. For more information,
// see Cluster VPC Considerations (https://docs.aws.amazon.com/eks/latest/userguide/network_reqs.html)
Expand Down Expand Up @@ -351,6 +408,32 @@ type OutpostConfigResponse struct {
// contains filtered or unexported fields
}

// KubernetesNetworkConfigResponse specifies the Kubernetes network configuration for the cluster.
// The response contains a value for serviceIpv6Cidr or serviceIpv4Cidr, but not both.
type KubernetesNetworkConfigResponse struct {
// The IP family used to assign Kubernetes pod and service IP addresses. The IP
// family is always ipv4, unless you have a 1.21 or later cluster running version
// 1.10.1 or later of the Amazon VPC CNI add-on and specified ipv6 when you created
// the cluster.
IPFamily IPFamily `json:"ipFamily,omitempty"`

// The CIDR block that Kubernetes pod and service IP addresses are assigned from.
// Kubernetes assigns addresses from an IPv4 CIDR block assigned to a subnet that
// the node is in. If you didn't specify a CIDR block when you created the cluster,
// then Kubernetes assigns addresses from either the 10.100.0.0/16 or 172.20.0.0/16
// CIDR blocks. If this was specified, then it was specified when the cluster was
// created and it can't be changed.
ServiceIpv4Cidr string `json:"serviceIpv4Cidr,omitempty"`

// The CIDR block that Kubernetes pod and service IP addresses are assigned from if
// you created a 1.21 or later cluster with version 1.10.1 or later of the Amazon
// VPC CNI add-on and specified ipv6 for ipFamily when you created the cluster.
// Kubernetes assigns service addresses from the unique local address range
// (fc00::/7) because you can't specify a custom IPv6 CIDR block when you create
// the cluster.
ServiceIpv6Cidr string `json:"serviceIpv6Cidr,omitempty"`
}

// VpcConfigResponse is the observed VPC configuration for a cluster.
type VpcConfigResponse struct {
// The cluster security group that was created by Amazon EKS for the cluster.
Expand Down
36 changes: 36 additions & 0 deletions apis/eks/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 72 additions & 0 deletions package/crds/eks.aws.crossplane.io_clusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,47 @@ spec:
- resources
type: object
type: array
kubernetesNetworkConfig:
description: The Kubernetes network configuration for the cluster.
properties:
ipFamily:
description: Specify which IP family is used to assign Kubernetes
pod and service IP addresses. If you don't specify a value,
ipv4 is used by default. You can only specify an IP family
when you create a cluster and can't change this value once
the cluster is created. If you specify ipv6, the VPC and
subnets that you specify for cluster creation must have
both IPv4 and IPv6 CIDR blocks assigned to them. You can't
specify ipv6 for clusters in China Regions. You can only
specify ipv6 for 1.21 and later clusters that use version
1.10.1 or later of the Amazon VPC CNI add-on. If you specify
ipv6, then ensure that your VPC meets the requirements listed
in the considerations listed in Assigning IPv6 addresses
to pods and services (https://docs.aws.amazon.com/eks/latest/userguide/cni-ipv6.html)
in the Amazon EKS User Guide. Kubernetes assigns services
IPv6 addresses from the unique local address range (fc00::/7).
You can't specify a custom IPv6 CIDR block. Pod addresses
are assigned from the subnet's IPv6 CIDR.
type: string
serviceIpv4Cidr:
description: "Don't specify a value if you select ipv6 for
ipFamily. The CIDR block to assign Kubernetes service IP
addresses from. If you don't specify a block, Kubernetes
assigns addresses from either the 10.100.0.0/16 or 172.20.0.0/16
CIDR blocks. We recommend that you specify a block that
does not overlap with resources in other networks that are
peered or connected to your VPC. The block must meet the
following requirements: \n * Within one of the following
private IP address blocks: 10.0.0.0/8, 172.16.0.0/12, or
192.168.0.0/16. \n * Doesn't overlap with any CIDR block
assigned to the VPC that you selected for VPC. \n * Between
/24 and /12. \n You can only specify a custom CIDR block
when you create a cluster and can't change this value once
the cluster is created."
type: string
required:
- ipFamily
type: object
logging:
description: "Enable or disable exporting the Kubernetes control
plane logs for your cluster to CloudWatch Logs. By default,
Expand Down Expand Up @@ -697,6 +738,37 @@ spec:
type: string
type: object
type: object
kubernetesNetworkConfig:
description: The Kubernetes network configuration for the cluster.
properties:
ipFamily:
description: The IP family used to assign Kubernetes pod and
service IP addresses. The IP family is always ipv4, unless
you have a 1.21 or later cluster running version 1.10.1
or later of the Amazon VPC CNI add-on and specified ipv6
when you created the cluster.
type: string
serviceIpv4Cidr:
description: The CIDR block that Kubernetes pod and service
IP addresses are assigned from. Kubernetes assigns addresses
from an IPv4 CIDR block assigned to a subnet that the node
is in. If you didn't specify a CIDR block when you created
the cluster, then Kubernetes assigns addresses from either
the 10.100.0.0/16 or 172.20.0.0/16 CIDR blocks. If this
was specified, then it was specified when the cluster was
created and it can't be changed.
type: string
serviceIpv6Cidr:
description: The CIDR block that Kubernetes pod and service
IP addresses are assigned from if you created a 1.21 or
later cluster with version 1.10.1 or later of the Amazon
VPC CNI add-on and specified ipv6 for ipFamily when you
created the cluster. Kubernetes assigns service addresses
from the unique local address range (fc00::/7) because you
can't specify a custom IPv6 CIDR block when you create the
cluster.
type: string
type: object
outpostConfig:
description: An object representing the configuration of your
local Amazon EKS cluster on an Amazon Web Services Outpost.
Expand Down
17 changes: 17 additions & 0 deletions pkg/clients/eks/eks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@ func GenerateCreateClusterInput(name string, p *v1beta1.ClusterParameters) *eks.
c.EncryptionConfig = GenerateEncryptionConfig(p)
}

if p.KubernetesNetworkConfig != nil {
c.KubernetesNetworkConfig = &ekstypes.KubernetesNetworkConfigRequest{
IpFamily: ekstypes.IpFamily(p.KubernetesNetworkConfig.IPFamily),
}
if p.KubernetesNetworkConfig.ServiceIpv4Cidr != "" {
c.KubernetesNetworkConfig.ServiceIpv4Cidr = awsclients.String(p.KubernetesNetworkConfig.ServiceIpv4Cidr)
}
}

c.ResourcesVpcConfig = &ekstypes.VpcConfigRequest{
EndpointPrivateAccess: p.ResourcesVpcConfig.EndpointPrivateAccess,
EndpointPublicAccess: p.ResourcesVpcConfig.EndpointPublicAccess,
Expand Down Expand Up @@ -257,6 +266,14 @@ func GenerateObservation(cluster *ekstypes.Cluster) v1beta1.ClusterObservation {
}
}

if cluster.KubernetesNetworkConfig != nil {
o.KubernetesNetworkConfig = v1beta1.KubernetesNetworkConfigResponse{
IPFamily: v1beta1.IPFamily(cluster.KubernetesNetworkConfig.IpFamily),
ServiceIpv4Cidr: awsclients.StringValue(cluster.KubernetesNetworkConfig.ServiceIpv4Cidr),
ServiceIpv6Cidr: awsclients.StringValue(cluster.KubernetesNetworkConfig.ServiceIpv6Cidr),
}
}

if cluster.ResourcesVpcConfig != nil {
o.ResourcesVpcConfig = v1beta1.VpcConfigResponse{
ClusterSecurityGroupID: awsclients.StringValue(cluster.ResourcesVpcConfig.ClusterSecurityGroupId),
Expand Down

0 comments on commit d13fa49

Please sign in to comment.