Simplify implementation

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

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/lib/charms/kratos/v0/kubernetes_network_policies.py b/lib/charms/kratos/v0/kubernetes_network_policies.py
@@ -82,8 +82,7 @@ def to_resource(self):
 
 
 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 +129,7 @@ def apply_ingress_policy(
             ingress.append(
                 NetworkPolicyIngressRule(
                     from_=selectors,
-                    ports=[port.to_resource()],
+                    ports=[NetworkPolicyPort(port=port, protocol="TCP")],
                 ),
             )
 
@@ -144,7 +143,6 @@ def apply_ingress_policy(
                 ),
                 policyTypes=["Ingress", "Egress"],
                 ingress=ingress,
-                egress=[NetworkPolicyEgressRule()],
             ),
         )
 

diff --git a/src/charm.py b/src/charm.py
@@ -544,12 +544,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: