From 4d5e1daeee72a75888335ef29aa2c8f015fd2119 Mon Sep 17 00:00:00 2001 From: Robert Volkmann Date: Fri, 12 Apr 2024 22:40:13 +0200 Subject: [PATCH] Fix make route for sonic --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9ef7909e..d7ccc89c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ .EXPORT_ALL_VARIABLES: # Commands -YQ=docker run --rm -i -v $(shell pwd):/workdir mikefarah/yq:3 /bin/sh -c +YQ=docker run --rm -i -v $(shell pwd):/workdir mikefarah/yq:4 KINDCONFIG := $(or $(KINDCONFIG),control-plane/kind.yaml) KUBECONFIG := $(shell pwd)/.kubeconfig @@ -95,8 +95,8 @@ env: .PHONY: _ips _ips: - $(eval ipL1 = $(shell ${YQ} "yq r clab-mini-lab/ansible-inventory.yml 'all.children.cvx.hosts.leaf01.ansible_host'")) - $(eval ipL2 = $(shell ${YQ} "yq r clab-mini-lab/ansible-inventory.yml 'all.children.cvx.hosts.leaf02.ansible_host'")) + $(eval ipL1 = $(shell ${YQ} --unwrapScalar=true '.nodes.leaf01."mgmt-ipv4-address"' clab-mini-lab/topology-data.json)) + $(eval ipL2 = $(shell ${YQ} --unwrapScalar=true '.nodes.leaf02."mgmt-ipv4-address"' clab-mini-lab/topology-data.json)) $(eval staticR = "100.255.254.0/24 nexthop via $(ipL1) dev docker0 nexthop via $(ipL2) dev docker0") .PHONY: route