Merge pull request #266 from mhkarimi1383/ipv6-support

✨ Internal Server IPv6 Support

Author: mergify[bot]

poetry.lock

@@ -23,6 +23,7 @@ dnspython = "^2.8.0"
 tldextract = "^5.3.0"
 humanize = "^4.14.0"
 setproctitle = "^1.3.7"
+ipaddress = "^1.0.23"
 
 [tool.poetry.scripts]
 rawfile = "rawfile.rawfile:cli"

pyproject.toml

@@ -20,6 +20,7 @@
 from orchestrator.k8s import node_ip_mapping
 from utils.volume_manager import manager as volume_manager
 from setproctitle import setproctitle
+import ipaddress
 import os
 
 
@@ -103,8 +104,12 @@ def csi_driver(driver_config: CSIDriverCmd):
         internal_pb2_grpc.add_InternalServicer_to_server(
             InternalServicer(), internal_server
         )
+        internal_ip_str = driver_config.internal_ip
+        internal_ip = ipaddress.ip_address(internal_ip_str)  # type: ignore
+        if internal_ip.version == 6:
+            internal_ip_str = f"[{internal_ip_str}]"
         internal_server.add_insecure_port(
-            f"{driver_config.internal_ip}:{driver_config.internal_port}"
+            f"{internal_ip_str}:{driver_config.internal_port}"
         )
 
     # NOTE: Controller methods are exposed on node plugin too because we are using distributed-snapshotting

rawfile/rawfile.py

@@ -1,3 +1,4 @@
+import ipaddress
 from pathlib import Path
 import time
 
@@ -300,9 +301,14 @@ def ControllerExpandVolume(self, request, context):
         node_name = volume_to_node(volume_id)
         size = request.capacity_range.required_bytes
 
-        node_ip = node_ip_mapping.get_node_ip(node_name)
+        node_ip_str = node_ip_mapping.get_node_ip(node_name)
         metadata = [(SIGNATURE_METADATA, config.csi_driver.internal_signature)]
-        channel = grpc.insecure_channel(f"{node_ip}:{config.csi_driver.internal_port}")
+        node_ip = ipaddress.ip_address(node_ip_str)
+        if node_ip.version == 6:
+            node_ip_str = f"[{node_ip_str}]"
+        channel = grpc.insecure_channel(
+            f"{node_ip_str}:{config.csi_driver.internal_port}"
+        )
         stub = internal_pb2_grpc.InternalStub(channel)
         response = stub.ExpandRawFile(
             internal_pb2.ExpandRawFileRequest(volume_id=volume_id, new_size=size),