Skip to content

Commit 96cd2ff

Browse files
Merge pull request #178 from srl-labs/fix/re-pin-clab
Fix/re pin clab
2 parents 11ed3c7 + 18a226b commit 96cd2ff

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

build/launcher.Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ FROM --platform=linux/amd64 debian:bookworm-slim
2626
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2727

2828
ARG DOCKER_VERSION="5:26.*"
29-
# pinning back as vxlan tools has some issue we need to investigate in 0.52.0
30-
ARG CONTAINERLAB_VERSION="0.51.3"
29+
# note: there is/was a breakage for clab tools/vxlan tunnel between 0.52.0 and 0.56.x -- fixed in
30+
# 0.57.5 of clab!
31+
ARG CONTAINERLAB_VERSION="0.57.5+"
3132
ARG NERDCTL_VERSION="1.7.6"
3233

3334
RUN apt-get update && \

constants/labels.go

-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ const (
3232
)
3333

3434
const (
35-
// TopologyServiceTypeNodeAlias is one of the allowed values for the LabelTopologyServiceType
36-
// label type -- this indicates that this service is of the type that provides docker-like
37-
// resolution of nodes in a Topology.
38-
TopologyServiceTypeNodeAlias = "nodeAlias"
3935
// TopologyServiceTypeFabric is one of the allowed values for the LabelTopologyServiceType label
4036
// type -- this indicates that this service is of the type that facilitates the connectivity
4137
// between containerlab devices in the cluster.

launcher/connectivity/vxlan.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (m *vxlanManager) Run() {
6262
m.updateVxlanTunnels,
6363
)
6464

65-
m.logger.Debug("slurpeeth connectivity setup complete")
65+
m.logger.Debug("vxlan connectivity setup complete")
6666
}
6767

6868
func (m *vxlanManager) resolveVXLANService(vxlanRemote string) (string, error) {

0 commit comments

Comments
 (0)