Merge pull request #609 from gefyrahq/probe-command-missing

Probe command missing

Author: SteinRobert

README.md

@@ -158,9 +158,6 @@ are actually able to reach cluster-based resources, such as databases, other (mi
 [*Nginx*](https://www.nginx.com/) is used for all kinds of proxying and reverse-proxying traffic, including the interceptions of already running containers
 in the cluster.
 
-### Rsync
-[*Rsync*](https://rsync.samba.org/) is used to synchronize directories from containers running in the cluster to local
-instances. This is particularly important for Kubernetes service account tokens during a bridge operation.
 
 <p align="right">(<a href="#top">back to top</a>)</p>
 

carrier/setprobe.sh

@@ -6,8 +6,15 @@ set -e
 DEFAULT_CONF_FILE="/tmp/nginx.conf"
 
 
+if [ -f /tmp/probesset_$1 ]; then
+    echo "Probe already set to $1"
+    exit 0
+fi
+
 echo "Setting listening port to $1 for probe"
 block="server {listen $1 default; location / {return 200;}}\n#HTTPMARKER"
 sed -i "s~#HTTPMARKER~$block~g" $DEFAULT_CONF_FILE
 
+touch /tmp/probesset_$1
+
 nginx -s reload -c $DEFAULT_CONF_FILE

operator/gefyra/bridge/carrier/__init__.py

@@ -13,7 +13,6 @@
 BUSYBOX_COMMAND = "/bin/busybox"
 CARRIER_CONFIGURE_COMMAND_BASE = [BUSYBOX_COMMAND, "sh", "setroute.sh"]
 CARRIER_CONFIGURE_PROBE_COMMAND_BASE = [BUSYBOX_COMMAND, "sh", "setprobe.sh"]
-CARRIER_RSYNC_COMMAND_BASE = [BUSYBOX_COMMAND, "sh", "syncdirs.sh"]
 CARRIER_ORIGINAL_CONFIGMAP = "gefyra-carrier-restore-configmap"
 
 
@@ -36,6 +35,21 @@ def install(self, parameters: Optional[Dict[Any, Any]] = None):
         parameters = parameters or {}
         self._patch_pod_with_carrier(handle_probes=parameters.get("handleProbes", True))
 
+    def _ensure_probes(self, container: k8s.client.V1Container) -> bool:
+        probes = self._get_all_probes(container)
+        for probe in probes:
+            try:
+                command = CARRIER_CONFIGURE_PROBE_COMMAND_BASE + [
+                    probe.http_get.port,
+                ]
+                exec_command_pod(
+                    core_v1_api, self.pod, self.namespace, self.container, command
+                )
+            except Exception as e:
+                self.logger.error(e)
+                return False
+        return True
+
     def installed(self) -> bool:
         pod = core_v1_api.read_namespaced_pod(name=self.pod, namespace=self.namespace)
         for container in pod.spec.containers:
@@ -44,7 +58,8 @@ def installed(self) -> bool:
                 and container.image
                 == f"{self.configuration.CARRIER_IMAGE}:{self.configuration.CARRIER_IMAGE_TAG}"
             ):
-                return True
+                # we always handle probes, flag is currently ignored
+                return self._ensure_probes(container=container)
         return False
 
     def ready(self) -> bool: