Fix the label in CRD for versions and add more parameters to NLB spec

Author: shyamradhakrishnan

api/v1beta1/types.go

@@ -953,6 +953,35 @@ type LoadBalancer struct {
 	// ID of Load Balancer.
 	// +optional
 	LoadBalancerId *string `json:"loadBalancerId,omitempty"`
+
+	// The NLB Spec
+	// +optional
+	NLBSpec NLBSpec `json:"nlbSpec,omitempty"`
+}
+
+// NLBSpec specifies the NLB spec.
+type NLBSpec struct {
+	// BackendSetDetails specifies the configuration of a network load balancer backend set.
+	// +optional
+	BackendSetDetails BackendSetDetails `json:"backendSetDetails,omitempty"`
+}
+
+// BackendSetDetails specifies the configuration of a network load balancer backend set.
+type BackendSetDetails struct {
+	// If this parameter is enabled, then the network load balancer preserves the source IP of the packet when it is forwarded to backends.
+	// Backends see the original source IP. If the isPreserveSourceDestination parameter is enabled for the network load balancer resource, then this parameter cannot be disabled.
+	// The value is false by default.
+	// +optional
+	IsPreserveSource *bool `json:"isPreserveSource,omitempty"`
+
+	// If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy.
+	// The value is false by default.
+	// +optional
+	IsFailOpen *bool `json:"isFailOpen,omitempty"`
+
+	// If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy.
+	// +optional
+	IsInstantFailoverEnabled *bool `json:"isInstantFailoverEnabled,omitempty"`
 }
 
 // NetworkSpec specifies what the OCI networking resources should look like.

api/v1beta1/zz_generated.conversion.go

@@ -961,6 +961,35 @@ type LoadBalancer struct {
 	// Type of Load Balancer: NLB (default) or LBaaS.
 	// +optional
 	LoadBalancerType LoadBalancerType `json:"loadBalancerType,omitempty"`
+
+	// The NLB Spec
+	// +optional
+	NLBSpec NLBSpec `json:"nlbSpec,omitempty"`
+}
+
+// NLBSpec specifies the NLB spec.
+type NLBSpec struct {
+	// BackendSetDetails specifies the configuration of a network load balancer backend set.
+	// +optional
+	BackendSetDetails BackendSetDetails `json:"backendSetDetails,omitempty"`
+}
+
+// BackendSetDetails specifies the configuration of a network load balancer backend set.
+type BackendSetDetails struct {
+	// If this parameter is enabled, then the network load balancer preserves the source IP of the packet when it is forwarded to backends.
+	// Backends see the original source IP. If the isPreserveSourceDestination parameter is enabled for the network load balancer resource, then this parameter cannot be disabled.
+	// The value is false by default.
+	// +optional
+	IsPreserveSource *bool `json:"isPreserveSource,omitempty"`
+
+	// If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy.
+	// The value is false by default.
+	// +optional
+	IsFailOpen *bool `json:"isFailOpen,omitempty"`
+
+	// If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy.
+	// +optional
+	IsInstantFailoverEnabled *bool `json:"isInstantFailoverEnabled,omitempty"`
 }
 
 // NetworkSpec specifies what the OCI networking resources should look like.

api/v1beta1/zz_generated.deepcopy.go

@@ -98,7 +98,8 @@ func (s *ClusterScope) DeleteApiServerNLB(ctx context.Context) error {
 // NLBSpec builds the Network LoadBalancer from the ClusterScope and returns it
 func (s *ClusterScope) NLBSpec() infrastructurev1beta2.LoadBalancer {
 	nlbSpec := infrastructurev1beta2.LoadBalancer{
-		Name: s.GetControlPlaneLoadBalancerName(),
+		Name:    s.GetControlPlaneLoadBalancerName(),
+		NLBSpec: s.OCIClusterAccessor.GetNetworkSpec().APIServerLB.NLBSpec,
 	}
 	return nlbSpec
 }
@@ -141,6 +142,10 @@ func (s *ClusterScope) UpdateNLB(ctx context.Context, nlb infrastructurev1beta2.
 // See https://docs.oracle.com/en-us/iaas/Content/NetworkLoadBalancer/overview.htm for more details on the Network
 // Load Balancer
 func (s *ClusterScope) CreateNLB(ctx context.Context, lb infrastructurev1beta2.LoadBalancer) (*string, *string, error) {
+	isPreserverSourceIp := lb.NLBSpec.BackendSetDetails.IsPreserveSource
+	if isPreserverSourceIp == nil {
+		isPreserverSourceIp = common.Bool(false)
+	}
 	listenerDetails := make(map[string]networkloadbalancer.ListenerDetails)
 	listenerDetails[APIServerLBListener] = networkloadbalancer.ListenerDetails{
 		Protocol:              networkloadbalancer.ListenerProtocolsTcp,
@@ -151,8 +156,10 @@ func (s *ClusterScope) CreateNLB(ctx context.Context, lb infrastructurev1beta2.L
 
 	backendSetDetails := make(map[string]networkloadbalancer.BackendSetDetails)
 	backendSetDetails[APIServerLBBackendSetName] = networkloadbalancer.BackendSetDetails{
-		Policy:           LoadBalancerPolicy,
-		IsPreserveSource: common.Bool(false),
+		Policy:                   LoadBalancerPolicy,
+		IsPreserveSource:         isPreserverSourceIp,
+		IsFailOpen:               lb.NLBSpec.BackendSetDetails.IsFailOpen,
+		IsInstantFailoverEnabled: lb.NLBSpec.BackendSetDetails.IsInstantFailoverEnabled,
 		HealthChecker: &networkloadbalancer.HealthChecker{
 			Port:       common.Int(int(s.APIServerPort())),
 			Protocol:   networkloadbalancer.HealthCheckProtocolsHttps,