Skip to content

Commit

Permalink
Merge pull request #178 from srl-labs/fix/re-pin-clab
Browse files Browse the repository at this point in the history
Fix/re pin clab
  • Loading branch information
carlmontanari authored Sep 30, 2024
2 parents 11ed3c7 + 18a226b commit 96cd2ff
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 3 additions & 2 deletions build/launcher.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ FROM --platform=linux/amd64 debian:bookworm-slim
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

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

RUN apt-get update && \
Expand Down
4 changes: 0 additions & 4 deletions constants/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ const (
)

const (
// TopologyServiceTypeNodeAlias is one of the allowed values for the LabelTopologyServiceType
// label type -- this indicates that this service is of the type that provides docker-like
// resolution of nodes in a Topology.
TopologyServiceTypeNodeAlias = "nodeAlias"
// TopologyServiceTypeFabric is one of the allowed values for the LabelTopologyServiceType label
// type -- this indicates that this service is of the type that facilitates the connectivity
// between containerlab devices in the cluster.
Expand Down
2 changes: 1 addition & 1 deletion launcher/connectivity/vxlan.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (m *vxlanManager) Run() {
m.updateVxlanTunnels,
)

m.logger.Debug("slurpeeth connectivity setup complete")
m.logger.Debug("vxlan connectivity setup complete")
}

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

0 comments on commit 96cd2ff

Please sign in to comment.