Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[#1766] feat: enhance IngressController to support configurable service protocol

Browse source
This commit is contained in:
Théophile Diot 2024-12-09 13:57:07 +01:00
parent 756daea931
commit b97257c7c3
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/autoconf/IngressController.py
View file

@ -19,7 +19,7 @@ class IngressController(Controller):
super().__init__("kubernetes")
config.load_incluster_config()
Configuration._default.verify_ssl = getenv("KUBERNETES_VERIFY_SSL", "yes") == "yes"
Configuration._default.verify_ssl = getenv("KUBERNETES_VERIFY_SSL", "yes").lower().strip() == "yes"
self._logger.info(f"SSL verification is {'enabled' if Configuration._default.verify_ssl else 'disabled'}")
ssl_ca_cert = getenv("KUBERNETES_SSL_CA_CERT", "")
@ -30,7 +30,7 @@ class IngressController(Controller):
self.__corev1 = client.CoreV1Api()
self.__networkingv1 = client.NetworkingV1Api()
self.__use_fqdn = getenv("USE_KUBERNETES_FQDN", "yes").lower() == "yes"
self.__use_fqdn = getenv("USE_KUBERNETES_FQDN", "yes").lower().strip() == "yes"
self._logger.info(f"Using Pod {'FQDN' if self.__use_fqdn else 'IP'} as hostname")
self.__ingress_class = getenv("KUBERNETES_INGRESS_CLASS", "")
@ -40,6 +40,12 @@ class IngressController(Controller):
self.__domain_name = getenv("KUBERNETES_DOMAIN_NAME", "cluster.local")
self._logger.info(f"Using domain name: {self.__domain_name}")
self.__service_protocol = getenv("KUBERNETES_SERVICE_PROTOCOL", "http").lower().strip()
if self.__service_protocol not in ("http", "https"):
self._logger.warning(f"Unsupported service protocol {self.__service_protocol}")
self.__service_protocol = "http"
self._logger.info(f"Using service protocol: {self.__service_protocol}")
def _get_controller_instances(self) -> list:
instances = []
pods = self.__corev1.list_pod_for_all_namespaces(watch=False).items
@ -162,7 +168,7 @@ class IngressController(Controller):
else:
port = path.backend.service.port.number
reverse_proxy_host = f"http://{path.backend.service.name}.{namespace}.svc.{self.__domain_name}"
reverse_proxy_host = f"{self.__service_protocol}://{path.backend.service.name}.{namespace}.svc.{self.__domain_name}"
if port != 80:
reverse_proxy_host += f":{port}"