feat: add octavia_provider config option with amphora deprecation warning (#834)

* feat: add octavia_provider config option with amphora deprecation warning

Add [driver] octavia_provider configuration option (default: amphora) and
log warning when legacy amphora provider is detected to encourage
migration to amphorav2.

Signed-off-by: okozachenko <[email protected]>

* fix lint

Signed-off-by: okozachenko <[email protected]>

* set default as amphorav2

Signed-off-by: okozachenko <[email protected]>

* remove configuration option for octavia provider

Signed-off-by: okozachenko <[email protected]>

* fix doc

Signed-off-by: okozachenko <[email protected]>

* update test

Signed-off-by: okozachenko <[email protected]>

* fix lint error

Signed-off-by: okozachenko <[email protected]>

* fix typo

Signed-off-by: okozachenko <[email protected]>

* fix lint error

Signed-off-by: okozachenko <[email protected]>

---------

Signed-off-by: okozachenko <[email protected]>

Author: okozachenko1203

Cargo.lock

@@ -115,7 +115,7 @@ is often accomplished by deploying a driver on each node.
 
    The Octavia provider to configure for the load balancers created by the cluster.
 
-   Default value: `amphora`
+   Default value: Octavia default
 
 * `octavia_lb_algorithm`
 

docs/user/labels.md

@@ -994,10 +994,13 @@ def get_object(self) -> dict:
 
         api_server_load_balancer = {
             "enabled": self.cluster.master_lb_enabled,
-            "provider": self.cluster.labels.get("octavia_provider", "amphora"),
         }
 
-        # Only add optional fields if they are not None
+        # Only add optional fields if they are set
+        octavia_provider = self.cluster.labels.get("octavia_provider")
+        if octavia_provider is not None:
+            api_server_load_balancer["provider"] = octavia_provider
+
         availability_zone = self.cluster.labels.get("api_server_lb_availability_zone")
         if availability_zone is not None:
             api_server_load_balancer["availabilityZone"] = availability_zone

magnum_cluster_api/resources.py

@@ -120,11 +120,11 @@ def generate_cloud_controller_manager_config(
     clouds_yaml = base64.decode_as_text(data.obj["data"]["clouds.yaml"])
     cloud_config = yaml.safe_load(clouds_yaml)
 
-    octavia_provider = cluster.labels.get("octavia_provider", "amphora")
+    octavia_provider = cluster.labels.get("octavia_provider", "amphorav2")
     octavia_lb_algorithm = cluster.labels.get("octavia_lb_algorithm")
     octavia_lb_healthcheck = cluster.labels.get("octavia_lb_healthcheck", True)
 
-    if octavia_provider == "amphora" and octavia_lb_algorithm is None:
+    if octavia_provider in ("amphora", "amphorav2") and octavia_lb_algorithm is None:
         octavia_lb_algorithm = "ROUND_ROBIN"
     elif octavia_provider == "ovn" and octavia_lb_algorithm is None:
         octavia_lb_algorithm = "SOURCE_IP_PORT"