Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Feat: ELBv2/TGs - Add health check customization #4849

Merged
merged 3 commits into from
Apr 19, 2024
Merged

✨ Feat: ELBv2/TGs - Add health check customization #4849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5570d7c
✨ elbv2/tg/test: add tests for ELBv2 TG health check
mtulio Mar 4, 2024
e9c8095
✨ elbv2/tg: Allow TG health check customization
mtulio Apr 1, 2024
5b2dabf
✨ elbv2/tg/api: expose API to customize LB/TG health check config
mtulio Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/v1beta1/awscluster_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ func restoreIPAMPool(restored, dst *infrav2.IPAMPool) {
func restoreControlPlaneLoadBalancer(restored, dst *infrav2.AWSLoadBalancerSpec) {
dst.Name = restored.Name
dst.HealthCheckProtocol = restored.HealthCheckProtocol
dst.HealthCheck = restored.HealthCheck
dst.LoadBalancerType = restored.LoadBalancerType
dst.DisableHostsRewrite = restored.DisableHostsRewrite
dst.PreserveClientIP = restored.PreserveClientIP
Expand Down
1 change: 1 addition & 0 deletions api/v1beta1/zz_generated.conversion.go
View file
Open in desktop

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

9 changes: 9 additions & 0 deletions api/v1beta2/awscluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,10 @@ type AWSLoadBalancerSpec struct {
// +optional
HealthCheckProtocol *ELBProtocol `json:"healthCheckProtocol,omitempty"`

// HealthCheck sets custom health check configuration to the API target group.
// +optional
HealthCheck *TargetGroupHealthCheckAPISpec `json:"healthCheck,omitempty"`

// AdditionalSecurityGroups sets the security groups used by the load balancer. Expected to be security group IDs
// This is optional - if not provided new security groups will be created for the load balancer
// +optional
Expand Down Expand Up @@ -257,11 +261,16 @@ type AdditionalListenerSpec struct {
// +kubebuilder:validation:Minimum=1
// +kubebuilder:validation:Maximum=65535
Port int64 `json:"port"`

// Protocol sets the protocol for the additional listener.
// Currently only TCP is supported.
// +kubebuilder:validation:Enum=TCP
// +kubebuilder:default=TCP
Protocol ELBProtocol `json:"protocol,omitempty"`

// HealthCheck sets the optional custom health check configuration to the API target group.
// +optional
HealthCheck *TargetGroupHealthCheckAdditionalSpec `json:"healthCheck,omitempty"`
}

// AWSClusterStatus defines the observed state of AWSCluster.
Expand Down
90 changes: 84 additions & 6 deletions api/v1beta2/network_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,90 @@ var (

// TargetGroupHealthCheck defines health check settings for the target group.
type TargetGroupHealthCheck struct {
Protocol *string `json:"protocol,omitempty"`
Path *string `json:"path,omitempty"`
Port *string `json:"port,omitempty"`
IntervalSeconds *int64 `json:"intervalSeconds,omitempty"`
TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"`
ThresholdCount *int64 `json:"thresholdCount,omitempty"`
Protocol *string `json:"protocol,omitempty"`
Path *string `json:"path,omitempty"`
Port *string `json:"port,omitempty"`
IntervalSeconds *int64 `json:"intervalSeconds,omitempty"`
TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"`
ThresholdCount *int64 `json:"thresholdCount,omitempty"`
UnhealthyThresholdCount *int64 `json:"unhealthyThresholdCount,omitempty"`
}

// TargetGroupHealthCheckAPISpec defines the optional health check settings for the API target group.
type TargetGroupHealthCheckAPISpec struct {
// The approximate amount of time, in seconds, between health checks of an individual
// target.
// +kubebuilder:validation:Minimum=5
// +kubebuilder:validation:Maximum=300
// +optional
IntervalSeconds *int64 `json:"intervalSeconds,omitempty"`

// The amount of time, in seconds, during which no response from a target means
// a failed health check.
// +kubebuilder:validation:Minimum=2
// +kubebuilder:validation:Maximum=120
// +optional
TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"`

// The number of consecutive health check successes required before considering
// a target healthy.
// +kubebuilder:validation:Minimum=2
// +kubebuilder:validation:Maximum=10
// +optional
ThresholdCount *int64 `json:"thresholdCount,omitempty"`

// The number of consecutive health check failures required before considering
// a target unhealthy.
// +kubebuilder:validation:Minimum=2
// +kubebuilder:validation:Maximum=10
// +optional
UnhealthyThresholdCount *int64 `json:"unhealthyThresholdCount,omitempty"`
}

// TargetGroupHealthCheckAdditionalSpec defines the optional health check settings for the additional target groups.
type TargetGroupHealthCheckAdditionalSpec struct {
// The protocol to use to health check connect with the target. When not specified the Protocol
// will be the same of the listener.
// +kubebuilder:validation:Enum=TCP;HTTP;HTTPS
// +optional
nrb marked this conversation as resolved.
Show resolved Hide resolved
Protocol *string `json:"protocol,omitempty"`

// The port the load balancer uses when performing health checks for additional target groups. When
// not specified this value will be set for the same of listener port.
// +optional
Port *string `json:"port,omitempty"`

// The destination for health checks on the targets when using the protocol HTTP or HTTPS,
// otherwise the path will be ignored.
// +optional
Path *string `json:"path,omitempty"`
// The approximate amount of time, in seconds, between health checks of an individual
// target.
// +kubebuilder:validation:Minimum=5
// +kubebuilder:validation:Maximum=300
// +optional
IntervalSeconds *int64 `json:"intervalSeconds,omitempty"`

// The amount of time, in seconds, during which no response from a target means
// a failed health check.
// +kubebuilder:validation:Minimum=2
// +kubebuilder:validation:Maximum=120
// +optional
TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"`

// The number of consecutive health check successes required before considering
// a target healthy.
// +kubebuilder:validation:Minimum=2
// +kubebuilder:validation:Maximum=10
// +optional
ThresholdCount *int64 `json:"thresholdCount,omitempty"`

// The number of consecutive health check failures required before considering
// a target unhealthy.
// +kubebuilder:validation:Minimum=2
// +kubebuilder:validation:Maximum=10
// +optional
UnhealthyThresholdCount *int64 `json:"unhealthyThresholdCount,omitempty"`
}

// TargetGroupAttribute defines attribute key values for V2 Load Balancer Attributes.
Expand Down
104 changes: 103 additions & 1 deletion api/v1beta2/zz_generated.deepcopy.go
View file
Open in desktop

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

12 changes: 12 additions & 0 deletions config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,6 +1462,9 @@ spec:
timeoutSeconds:
format: int64
type: integer
unhealthyThresholdCount:
format: int64
type: integer
type: object
vpcId:
type: string
Expand Down Expand Up @@ -1678,6 +1681,9 @@ spec:
timeoutSeconds:
format: int64
type: integer
unhealthyThresholdCount:
format: int64
type: integer
type: object
vpcId:
type: string
Expand Down Expand Up @@ -3364,6 +3370,9 @@ spec:
timeoutSeconds:
format: int64
type: integer
unhealthyThresholdCount:
format: int64
type: integer
type: object
vpcId:
type: string
Expand Down Expand Up @@ -3580,6 +3589,9 @@ spec:
timeoutSeconds:
format: int64
type: integer
unhealthyThresholdCount:
format: int64
type: integer
type: object
vpcId:
type: string
Expand Down
Loading