conlink 2.5.1 → 2.5.3

package/.github/workflows/push.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch: {}
 
 jobs:
-  compose-tests:
+  tests:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -22,3 +22,11 @@ jobs:
       - name: "dctest test/test*.yaml"
         timeout-minutes: 5
         run: time node_modules/.bin/dctest --verbose-commands conlink-test $(ls -v test/test*.yaml)
+
+      - name: Check --show-config and net2dot
+        run: |
+          cfg=$(./conlink --show-config --compose-file examples/test1-compose.yaml)
+          summary=$(echo "${cfg}" | jq -r '.|"\(.bridges|keys|sort|join(".")) \(.services|keys|sort|join("."))"')
+          [ "${summary}" = "s1.s2.s3 h1.h2.h3.r0" ]
+          dot=$(echo "${cfg}" | ./net2dot)
+          [ $(echo "${dot}" | grep "r0.*eth" | wc -l) -ge 10 ]

package/mdc

@@ -30,7 +30,7 @@ RESOLVED_MODES="$(${RESOLVE_DEPS} --path "${MODES_DIR}" --format=paths ${MODE_SP
 
 COMPOSE_FILE=./.compose-empty.yaml
 cat /dev/null > ${ENV_FILE}-mdc-tmp
-echo -e "version: '2.4'\nservices: {}" > ./.compose-empty.yaml
+echo -e "services: {}" > ./.compose-empty.yaml
 
 vecho "Removing ${MDC_FILES_DIR}"
 case "$(basename ${MDC_FILES_DIR})" in

package/net2dot.cljs

@@ -57,11 +57,12 @@
   (let [graph (digraph {:splines true :compound true})
         host (subgraph graph "cluster_host" "host system" HOST-PROPS)
         conlink (subgraph host "cluster_conlink" "conlink/network" CONLINK-PROPS)
+        links (->> network-config :services vals (map :links) (apply concat))
         bridges (reduce
                   #(->> (subgraph conlink (str "cluster_bridge_" %2)
                                   %2 BRIDGE-PROPS)
                         (assoc %1 %2))
-                  {} (map :bridge (keep :bridge (:links network-config))))
+                  {} (keys (:bridges network-config)))
         services (reduce
                    #(->> (subgraph host (str "cluster_service_" (dot-id %2))
                                    (str "service '" (name %2) "'") SVC-PROPS)
@@ -73,7 +74,7 @@
                            (assoc %1 %2))
                      {} (keys (:containers network-config)))]
 
-    (doseq [link (:links network-config)]
+    (doseq [link links]
       (let [{:keys [service container dev outer-dev bridge base]} link
             cname (or service container)
             cnode (get (if service services containers) (keyword cname))
@@ -85,7 +86,7 @@
                                    "-" (name dev)))
                 out-id (str "out-" outer-dev)
                 out-parent (condp = (keyword base)
-                             :conlink (get bridges (:bridge bridge))
+                             :conlink (get bridges (keyword (:bridge bridge)))
                              :host host)
                 {:keys [type vlanid]} link
                 [elabel iprops] (if (= "host" base)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "conlink",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "conlink -  Declarative Low-Level Networking for Containers",
   "repository": "https://github.com/LonoCloud/conlink",
   "license": "SEE LICENSE IN LICENSE",

package/src/conlink/core.cljs

@@ -112,7 +112,7 @@ General Options:
   - Add default values to a link:
     - type: veth
     - dev: eth0
-    - mac: random MAC starting with first octet of 'c2'
+    - mac: random MAC starting with first octet of 'c2' (not added to ipvlan)
     - mtu: --default-mtu (for non *vlan type)
     - base: :conlink for veth type, :host for *vlan types, :local otherwise"
   [{:as link :keys [type bridge ip route forward netem ethtool]} bridges opts]
@@ -120,7 +120,8 @@ General Options:
         {:keys [default-mtu keep-veth-offload]} opts
         type (keyword (or type "veth"))
         dev (get link :dev "eth0")
-        mac (get link :mac (random-mac))
+        mac (when-not (= :ipvlan type)
+              (get link :mac (random-mac)))
         base-default (cond (= :veth type)     :conlink
                            (VLAN-TYPES type)  :host
                            :else              :local)
@@ -138,10 +139,11 @@ General Options:
                {:type type
                 :dev  dev
                 :base base
-                :mac mac
                 :ethtool ethtool}
                (when bridge
                  {:bridge bridge})
+               (when mac
+                 {:mac mac})
                (when (not (VLAN-TYPES type))
                  {:mtu  (get link :mtu default-mtu)})
                (when route
@@ -904,7 +906,7 @@ General Options:
      docker-eth0-addresses (when docker-eth0? (intf-ipv4-addresses "eth0"))
      _ (swap! ctx merge {:kmod-ovs? kmod-ovs?
                          :kmod-mirred? kmod-mirred?
-                         :docker-eth0? docker-eth0?
+                         :docker-eth0? (or docker-eth0? show-config)
                          :docker-eth0-address (first docker-eth0-addresses)})
      network-config (P/-> (load-configs compose-file network-file)
                           (interpolate-walk env)
@@ -977,7 +979,9 @@ General Options:
                (P/let
                  [event-filter {"event" ["start" "die"]}
                   ;; Listen for docker and/or podman events
-                  _ (docker-listen client event-filter handle-event)
+                  ;; NOTE: sometimes (podman on macos) this blocks
+                  ;; until the first event. Wrap it to skip await.
+                  _ [(docker-listen client event-filter handle-event)]
                   containers ^obj (list-containers client)]
                  ;; Generate fake events for existing containers
                  (P/all (for [container containers