Merge pull request #62 from ocadotechnology/alexey.mavrin/hostess-les…

…s-mode

feat: add 'services' addressing scheme

.travis.yml

@@ -1,4 +1,5 @@
 language: python
+dist: focal
 python:
 - '3.8'
 sudo: required

mirroroperator/operator.py

@@ -1,10 +1,11 @@
 import ast
-import kubernetes
+import json
 import logging
 import time
 import os
-
 from http import HTTPStatus
+import kubernetes
+
 from kubernetes.client.rest import ApiException
 from mirroroperator.registrymirror import RegistryMirror
 from mirroroperator.exceptions import NoCRDException
@@ -17,7 +18,11 @@
 CRD_PLURAL = "registrymirrors"
 
 
-class MirrorOperator(object):
+# pylint: disable=too-few-public-methods
+class MirrorOperator:
+    # pylint: disable=fixme
+    # FIXME: pylint warning: redefined-outer-name: Redefining name 'env_vars' from outer scope
+    # pylint: disable=redefined-outer-name
     def __init__(self, env_vars):
         """
         :param env_vars: dictionary includes namespace,
@@ -26,6 +31,8 @@ def __init__(self, env_vars):
             ss_ds_labels (used in RegistryMirror, optional),
             ss_ds_template_lables (used in RegistryMirror, optional)
             ss_ds_tolerations (used in RegistryMirror, optional)
+            addressing_scheme ('hostess' or 'services', defaults to 'hostess', optional)
+            imageswap_namespace (used in MirrorOperator, default to the operator namespace, optional)
             hostess_docker_image (used in RegistryMirror),
             hostess_docker_tag (used in RegistryMirror),
             image_pull_secrets(used in RegistryMirror, optional),
@@ -36,8 +43,8 @@ def __init__(self, env_vars):
             raise TypeError("Missing docker certificate secret")
         self.registry_mirror_vars = env_vars
         kubernetes.config.load_incluster_config()
-        self.crd_api = kubernetes.client.ExtensionsV1beta1Api()
         self.object_api = kubernetes.client.CustomObjectsApi()
+        self.core_api = kubernetes.client.CoreV1Api()
 
     def watch_registry_mirrors(self):
         watcher = kubernetes.watch.Watch()
@@ -50,25 +57,57 @@ def watch_registry_mirrors(self):
             ):
                 registry_mirror_kwargs = event['object'].copy()
                 registry_mirror_kwargs.update(self.registry_mirror_vars)
-                LOGGER.debug("RM kwargs: {}".format(registry_mirror_kwargs))
+                LOGGER.debug("RM kwargs: %s", registry_mirror_kwargs)
                 mirror = RegistryMirror(
                     event_type=event['type'], **registry_mirror_kwargs
                 )
                 mirror.apply()
+                if self.registry_mirror_vars['addressing_scheme'] == 'services':
+                    self.update_imageswap_config()
         except ApiException as e:
             status = HTTPStatus(e.status)
             if status == HTTPStatus.NOT_FOUND:
                 raise NoCRDException(
                     "CRD not found. Please ensure you create a CRD with group"
-                    " - %s, version - %s and plural - %s before this operator"
-                    " can run.",
-                    CRD_GROUP, CRD_VERSION, CRD_PLURAL)
-            else:
-                LOGGER.exception(
-                    "Error watching custom object events",
-                    exc_info=True
-                )
+                    " - {}, version - {} and plural - {} before this operator"
+                    " can run.".format(CRD_GROUP, CRD_VERSION, CRD_PLURAL)) from e
+            LOGGER.exception(
+                "Error watching custom object events",
+                exc_info=True
+            )
 
+    def update_imageswap_config(self):
+        registrymirrors = self.object_api.list_cluster_custom_object(
+                              CRD_GROUP, CRD_VERSION, CRD_PLURAL)
+        imageswap_config = "default:\n"
+        for mirror in registrymirrors['items']:
+            service_name = "registry-mirror-" + mirror['metadata']['name']
+            service_namespace = self.registry_mirror_vars['namespace']
+            try:
+                mirror_service = self.core_api.read_namespaced_service(
+                                     service_name, service_namespace)
+            except ApiException as api_exception:
+                json_error = json.loads(api_exception.body)
+                code = HTTPStatus(int(json_error['code']))
+                if code == HTTPStatus.NOT_FOUND:
+                    LOGGER.info("Serfice %s not (yet) configured", service_name)
+                else:
+                    LOGGER.error("API returned status: %s, msg: %s",
+                        code, json_error['message'])
+                continue
+            service_ip = mirror_service.spec.cluster_ip
+            if 'masqueradeUrl' in mirror['spec']:
+                masqueraded_name = mirror['spec']['masqueradeUrl']
+            else:
+                masqueraded_name = "mirror-" + mirror['spec']['upstreamUrl']
+            imageswap_config += "{0}:{1}/{0}\n".format(masqueraded_name, service_ip)
+        LOGGER.info("Imageswap config: %s", imageswap_config)
+        imageswap_namespace = self.registry_mirror_vars['imageswap_namespace']
+        self.core_api.patch_namespaced_config_map(
+                "imageswap-maps",
+                imageswap_namespace,
+                {"data": {"maps": imageswap_config}}
+        )
 
 def safely_eval_env(env_var):
     return ast.literal_eval(os.environ.get(env_var)
@@ -79,14 +118,18 @@ def safely_eval_env(env_var):
     logging.basicConfig(level=logging.INFO)
 
     # Get organization specific variables from env
+    env_namespace=os.environ.get("NAMESPACE", "default")
     env_vars = dict(
-        namespace=os.environ.get("NAMESPACE", "default"),
+        namespace=env_namespace,
         # optional to allow for image to be pulled from elsewhere
         docker_registry=os.environ.get(
             "DOCKER_REGISTRY", "docker.io"),
+        # pylint: disable=fixme
         # TODO: remove 'hostess_docker_registry' in 1.0.0
         hostess_docker_registry=os.environ.get(
             "HOSTESS_DOCKER_REGISTRY", "docker.io"),
+        addressing_scheme=os.environ.get("ADDRESSING_SCHEME", "hostess"),
+        imageswap_namespace=os.environ.get("IMAGESWAP_NAMESPACE", env_namespace),
         hostess_docker_image=os.environ.get("HOSTESS_DOCKER_IMAGE",
                                             "ocadotechnology/mirror-hostess"),
         hostess_docker_tag=os.environ.get("HOSTESS_DOCKER_TAG", "1.1.0"),