Merge pull request #2512 from pbasov/api-lb-mon

✨Allow API Loadbalancer Health Monitor configuration

Author: k8s-ci-robot

Makefile

@@ -184,7 +184,8 @@ e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \
 		 cluster-template-flatcar.yaml \
                  cluster-template-k8s-upgrade.yaml \
 		 cluster-template-flatcar-sysext.yaml \
-		 cluster-template-no-bastion.yaml)
+		 cluster-template-no-bastion.yaml \
+		 cluster-template-health-monitor.yaml)
 # Currently no templates that require CI artifacts
 # $(addprefix $(E2E_TEMPLATES_DIR)/, add-templates-here.yaml) \
 

api/v1beta1/types.go

@@ -879,6 +879,39 @@ type APIServerLoadBalancer struct {
 	// Flavor is the flavor name that will be used to create the APIServerLoadBalancer Spec.
 	//+optional
 	Flavor optional.String `json:"flavor,omitempty"`
+
+	// Monitor contains configuration for the load balancer health monitor.
+	//+optional
+	Monitor *APIServerLoadBalancerMonitor `json:"monitor,omitempty"`
+}
+
+// APIServerLoadBalancerMonitor contains configuration for the load balancer health monitor.
+type APIServerLoadBalancerMonitor struct {
+	// Delay is the time in seconds between sending probes to members.
+	//+optional
+	//+kubebuilder:validation:Minimum=0
+	//+kubebuilder:default:10
+	Delay int `json:"delay,omitempty"`
+
+	// Timeout is the maximum time in seconds for a monitor to wait for a connection to be established before it times out.
+	//+optional
+	//+kubebuilder:validation:Minimum=0
+	//+kubebuilder:default:5
+	Timeout int `json:"timeout,omitempty"`
+
+	// MaxRetries is the number of successful checks before changing the operating status of the member to ONLINE.
+	//+optional
+	//+kubebuilder:validation:Minimum=0
+	//+kubebuilder:validation:Maximum=10
+	//+kubebuilder:default:5
+	MaxRetries int `json:"maxRetries,omitempty"`
+
+	// MaxRetriesDown is the number of allowed check failures before changing the operating status of the member to ERROR.
+	//+optional
+	//+kubebuilder:validation:Minimum=1
+	//+kubebuilder:validation:Maximum=10
+	//+kubebuilder:default:3
+	MaxRetriesDown int `json:"maxRetriesDown,omitempty"`
 }
 
 func (s *APIServerLoadBalancer) IsZero() bool {

api/v1beta1/zz_generated.deepcopy.go

@@ -54,6 +54,7 @@ type LbClient interface {
 	DeletePoolMember(poolID string, lbMemberID string) error
 	CreateMonitor(opts monitors.CreateOptsBuilder) (*monitors.Monitor, error)
 	ListMonitors(opts monitors.ListOptsBuilder) ([]monitors.Monitor, error)
+	UpdateMonitor(id string, opts monitors.UpdateOptsBuilder) (*monitors.Monitor, error)
 	DeleteMonitor(id string) error
 	ListLoadBalancerProviders() ([]providers.Provider, error)
 	ListOctaviaVersions() ([]apiversions.APIVersion, error)
@@ -239,6 +240,15 @@ func (l lbClient) ListMonitors(opts monitors.ListOptsBuilder) ([]monitors.Monito
 	return monitors.ExtractMonitors(allPages)
 }
 
+func (l lbClient) UpdateMonitor(id string, opts monitors.UpdateOptsBuilder) (*monitors.Monitor, error) {
+	mc := metrics.NewMetricPrometheusContext("loadbalancer_healthmonitor", "update")
+	monitor, err := monitors.Update(context.TODO(), l.serviceClient, id, opts).Extract()
+	if mc.ObserveRequest(err) != nil {
+		return nil, err
+	}
+	return monitor, nil
+}
+
 func (l lbClient) DeleteMonitor(id string) error {
 	mc := metrics.NewMetricPrometheusContext("loadbalancer_healthmonitor", "delete")
 	err := monitors.Delete(context.TODO(), l.serviceClient, id).ExtractErr()