Merge "Remove sgId from KuryrNet CRD"

kubernetes_crds/kuryrnet.yaml

@@ -39,8 +39,6 @@ spec:
                 type: boolean
               routerId:
                 type: string
-              sgId:
-                type: string
               subnetCIDR:
                 type: string
               subnetId:

kuryr_kubernetes/controller/handlers/kuryrnet.py

@@ -64,10 +64,6 @@ class KuryrNetHandler(k8s_base.ResourceEventHandler):
         # required
         project_id = self._drv_project.get_project(namespace)
         subnets = self._drv_subnets.get_namespace_subnet(namespace, subnet_id)
-        sgs = []
-        sg_id = kuryrnet_crd['spec'].get('sgId')
-        if sg_id:
-            sgs.append(sg_id)
 
         nodes = utils.get_nodes_ips()
         # NOTE(ltomasbo): Patching the kuryrnet_crd here instead of after
@@ -86,7 +82,7 @@ class KuryrNetHandler(k8s_base.ResourceEventHandler):
                       node_ip)
             try:
                 self._drv_vif_pool.populate_pool(node_ip, project_id, subnets,
-                                                 sgs)
+                                                 [])
             except exceptions.ResourceNotReady:
                 # Ensure the repopulation is retriggered if the system was not
                 # yet ready to perform the repopulation actions

kuryr_kubernetes/tests/unit/controller/drivers/test_namespace_subnet.py

@@ -301,12 +301,10 @@ class TestNamespacePodSubnetDriver(test_base.TestCase):
         router_id = mock.sentinel.router_id
         net_id = mock.sentinel.net_id
         subnet_id = mock.sentinel.subnet_id
-        sg_id = mock.sentinel.sg_id
         crd_spec = {
             'subnetId': subnet_id,
             'routerId': router_id,
             'netId': net_id,
-            'sgId': sg_id
         }
         namespace = mock.sentinel.namespace
 
@@ -324,12 +322,10 @@ class TestNamespacePodSubnetDriver(test_base.TestCase):
         router_id = mock.sentinel.router_id
         net_id = mock.sentinel.net_id
         subnet_id = mock.sentinel.subnet_id
-        sg_id = mock.sentinel.sg_id
         crd_spec = {
             'subnetId': subnet_id,
             'routerId': router_id,
             'netId': net_id,
-            'sgId': sg_id
         }
         namespace = mock.sentinel.namespace