fix: ksvc virtual service mapping, otomi has docker check

binzx/otomi

@@ -60,7 +60,8 @@ if package_is_core $(pwd); then
   in_core=1
   core_path=$(pwd)
 fi
-has_docker=$(command -v docker &>/dev/null)
+
+has_docker=$(command -v docker) &>/dev/null
 
 [ -z $ENV_DIR ] && [ -n "$in_core" ] && echo "No ENV_DIR set!" && exit 1
 [ -z $ENV_DIR ] && ENV_DIR="$PWD"

charts/team-ns/templates/istio-virtualservices.yaml

@@ -12,7 +12,7 @@
     {{- if not (or (eq $type "cluster") (hasKey $s "host")) }}
       {{- $svc := (hasKey $s "hasPrefix" | ternary (printf "%s-%s" $v.teamId ($s.svc | default $s.name)) ($s.svc | default $s.name)) }}
       {{- $domain := include "service.domain" (dict "s" $s "dot" $ "vs" true) }}
-      {{- $knativeServiceDomain := printf "%s.%s" $s.name $v.cluster.domainSuffix }}
+      {{- $knativeServiceDomain := printf "%s.%s" $s.name $v.domain }}
       {{- if not (and $s.ksvc (eq $knativeServiceDomain $domain)) }}
         {{- $vsName := include "flatten-name" (printf "%s%s" $domain (hasKey $s "paths" | ternary (printf "-%s" (include "helm-toolkit.utils.joinListWithSep" (dict "list" $s.paths "sep" "|"))) "")) }}
 apiVersion: networking.istio.io/v1beta1
@@ -71,7 +71,7 @@ spec:
           {{- if hasKey $s "ksvc" }}
       route:
         - destination:
-            host: istio-ingressgateway.istio-system.svc.cluster.local
+            host: istio-ingressgateway-{{ $type }}.istio-system.svc.cluster.local
           {{- else }}
       route:
         - destination: