Fix nlb service update

Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]>
exoscale · Nov 13, 2024 · c93b77f · c93b77f
1 parent 1647332
commit c93b77f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/exoscale/loadbalancer.go b/exoscale/loadbalancer.go
@@ -332,12 +332,12 @@ next:
 					nlbServiceUpdate.ID,
 					v3.UpdateLoadBalancerServiceRequest{
 						Name:        nlbServiceUpdate.Name,
-						Description: nlbServiceCurrent.Description,
-						Port:        nlbServiceCurrent.Port,
-						TargetPort:  nlbServiceCurrent.TargetPort,
-						Protocol:    v3.UpdateLoadBalancerServiceRequestProtocol(nlbServiceCurrent.Protocol),
-						Strategy:    v3.UpdateLoadBalancerServiceRequestStrategy(nlbServiceCurrent.Strategy),
-						Healthcheck: nlbServiceCurrent.Healthcheck,
+						Description: nlbServiceUpdate.Description,
+						Port:        nlbServiceUpdate.Port,
+						TargetPort:  nlbServiceUpdate.TargetPort,
+						Protocol:    v3.UpdateLoadBalancerServiceRequestProtocol(nlbServiceUpdate.Protocol),
+						Strategy:    v3.UpdateLoadBalancerServiceRequestStrategy(nlbServiceUpdate.Strategy),
+						Healthcheck: nlbServiceUpdate.Healthcheck,
 					},
 				); err != nil {
 					return err
@@ -350,12 +350,15 @@ next:
 
 			svc, err := l.p.client.AddServiceToLoadBalancer(ctx, nlbCurrent.ID, v3.AddServiceToLoadBalancerRequest{
 				Name:        nlbServiceUpdate.Name,
-				Description: nlbServiceCurrent.Description,
-				Port:        nlbServiceCurrent.Port,
-				TargetPort:  nlbServiceCurrent.TargetPort,
-				Protocol:    v3.AddServiceToLoadBalancerRequestProtocol(nlbServiceCurrent.Protocol),
-				Strategy:    v3.AddServiceToLoadBalancerRequestStrategy(nlbServiceCurrent.Strategy),
-				Healthcheck: nlbServiceCurrent.Healthcheck,
+				Description: nlbServiceUpdate.Description,
+				Port:        nlbServiceUpdate.Port,
+				TargetPort:  nlbServiceUpdate.TargetPort,
+				Protocol:    v3.AddServiceToLoadBalancerRequestProtocol(nlbServiceUpdate.Protocol),
+				Strategy:    v3.AddServiceToLoadBalancerRequestStrategy(nlbServiceUpdate.Strategy),
+				Healthcheck: nlbServiceUpdate.Healthcheck,
+				InstancePool: &v3.InstancePool{
+					ID: nlbServiceUpdate.InstancePool.ID,
+				},
 			})
 			if err != nil {
 				return err

diff --git a/test/tests_1_control_plane/test_103_control_plane_start.py b/test/tests_1_control_plane/test_103_control_plane_start.py
@@ -22,7 +22,7 @@ def test_k8s_version(test, tf_control_plane, logger):
         output["serverVersion"]["major"],
         output["serverVersion"]["minor"],
     )
-    assert version_major_minor in ["1.28", "1.29", "1.30"]
+    assert version_major_minor in ["1.28", "1.29", "1.30", "1.31"]
 
 
 @pytest.mark.control_plane