Remove external-load-balancer-port config

canonical · Jan 8, 2025 · a809297 · a809297
1 parent 3aa9688
commit a809297
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/charms/worker/k8s/charmcraft.yaml b/charms/worker/k8s/charmcraft.yaml
@@ -389,12 +389,6 @@ config:
       description: |
         Labels can be used to organize and to select subsets of nodes in the
         cluster. Declare node labels in key=value format, separated by spaces.      
-    external-load-balancer-port:
-      description: |
-        Port exposed by the external load balancer to direct traffic to this charm.
-        The external load balancer should be related to this charm on the `external-load-balancer` relation.
-      type: int
-      default: 443
 
 resources:
   snap-installation:

diff --git a/charms/worker/k8s/src/charm.py b/charms/worker/k8s/src/charm.py
@@ -79,8 +79,8 @@
     ENDPOINT_HAS_PORT_REGEX,
     ETC_KUBERNETES,
     ETCD_RELATION,
+    EXTERNAL_LOAD_BALANCER_PORT,
     EXTERNAL_LOAD_BALANCER_RELATION,
-    EXTERNAL_LOAD_BALANCER_PORT_CONFIG,
     EXTERNAL_LOAD_BALANCER_REQUEST_NAME,
     EXTERNAL_LOAD_BALANCER_RESPONSE_NAME,
     HTTP_SCHEME,
@@ -423,7 +423,7 @@ def _configure_external_load_balancer(self):
 
         req = self.external_load_balancer.get_request(EXTERNAL_LOAD_BALANCER_REQUEST_NAME)
         req.protocol = req.protocols.tcp
-        req.port_mapping = {self.config.get(EXTERNAL_LOAD_BALANCER_PORT_CONFIG): APISERVER_PORT}
+        req.port_mapping = {EXTERNAL_LOAD_BALANCER_PORT: APISERVER_PORT}
         req.public = True
         if not req.health_checks:
             req.add_health_check(protocol=req.protocols.http, port=APISERVER_PORT, path="/livez")
@@ -1142,7 +1142,7 @@ def _get_external_kubeconfig(self, event: ops.ActionEvent):
                     port = str(APISERVER_PORT)
                     if self.is_control_plane and self.external_load_balancer.is_available:
                         log.info("Using external load balancer port as the public port")
-                        port = str(self.config.get(EXTERNAL_LOAD_BALANCER_PORT_CONFIG))
+                        port = str(EXTERNAL_LOAD_BALANCER_PORT)
                     server = self._format_kube_api_url(server, port)
                     log.info("Formatted server address: %s", server)
             log.info("Requesting kubeconfig for server=%s", server)

diff --git a/charms/worker/k8s/src/literals.py b/charms/worker/k8s/src/literals.py
@@ -22,7 +22,7 @@
 HTTPS_SCHEME = "https://"
 EXTERNAL_LOAD_BALANCER_REQUEST_NAME = "api-server-external"
 EXTERNAL_LOAD_BALANCER_RESPONSE_NAME = EXTERNAL_LOAD_BALANCER_REQUEST_NAME
-EXTERNAL_LOAD_BALANCER_PORT_CONFIG = "external-load-balancer-port"
+EXTERNAL_LOAD_BALANCER_PORT = 443 
 ENDPOINT_HAS_PORT_REGEX = r":\d+$"
 APISERVER_PORT = 6443