Simplify implementation

canonical · Apr 21, 2023 · f5b33f7 · f5b33f7
1 parent d3f5a2f
commit f5b33f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 26 deletions.
diff --git a/lib/charms/kratos/v0/kubernetes_network_policies.py b/lib/charms/kratos/v0/kubernetes_network_policies.py
@@ -66,24 +66,8 @@ class NetworkPoliciesHandlerError(Exception):
     """Applying the network policies failed."""
 
 
-@dataclass
-class PortDefinition:
-    """Network Policy port definition."""
-
-    port: Union[str, int]
-    end_port: Optional[int] = None
-    protocol: Optional[str] = "TCP"
-
-    def to_resource(self):
-        """Convert class to NetworkPolicyPort."""
-        if not self.end_port:
-            return NetworkPolicyPort(port=self.port, protocol=self.protocol)
-        return NetworkPolicyPort(port=self.port, endPort=self.end_port, protocol=self.protocol)
-
-
 Port = Union[str, int]
-IngressPolicyDefinition = Union[Tuple[Port], Tuple[int, str], Tuple[int, str, int]]
-IngressPolicyDefinition = Tuple[PortDefinition, List[Relation]]
+IngressPolicyDefinition = Tuple[Port, List[Relation]]
 
 
 class KubernetesNetworkPoliciesHandler:
@@ -130,7 +114,7 @@ def apply_ingress_policy(
             ingress.append(
                 NetworkPolicyIngressRule(
                     from_=selectors,
-                    ports=[port.to_resource()],
+                    ports=[NetworkPolicyPort(port=port, protocol="TCP")],
                 ),
             )
 
@@ -144,7 +128,6 @@ def apply_ingress_policy(
                 ),
                 policyTypes=["Ingress", "Egress"],
                 ingress=ingress,
-                egress=[NetworkPolicyEgressRule()],
             ),
         )
 

diff --git a/src/charm.py b/src/charm.py
@@ -34,7 +34,6 @@
 from charms.kratos.v0.kubernetes_network_policies import (
     KubernetesNetworkPoliciesHandler,
     NetworkPoliciesHandlerError,
-    PortDefinition,
 )
 from charms.kratos_external_idp_integrator.v0.kratos_external_provider import (
     ClientConfigChangedEvent,
@@ -544,12 +543,10 @@ def _apply_network_policies(self, event: HookEvent) -> None:
         try:
             self.network_policy_handler.apply_ingress_policy(
                 [
-                    # (PortDefinition(1, KRATOS_PUBLIC_PORT - 1), []),
-                    (PortDefinition(KRATOS_PUBLIC_PORT), [self.public_ingress.relation]),
-                    (PortDefinition(KRATOS_ADMIN_PORT), [self.admin_ingress.relation]),
-                    (PortDefinition(38812), []),
-                    (PortDefinition(38813), []),
-                    # (PortDefinition(KRATOS_ADMIN_PORT + 1, 65535), []),
+                    (KRATOS_PUBLIC_PORT, [self.public_ingress.relation]),
+                    (KRATOS_ADMIN_PORT, [self.admin_ingress.relation]),
+                    (38812, []),
+                    (38813, []),
                 ]
             )
         except NetworkPoliciesHandlerError: