fix: restructure IPAM to be more easier to use #866

Open

ecoppens wants to merge 33 commits from ipam-v2 into main

pull from: ipam-v2

merge into: DGNum:main

DGNum:main

DGNum:lon/wp4nix

DGNum:lon/proxmox-nixos

DGNum:lon/nixos-unstable

DGNum:lon/nixos-26.05

DGNum:lon/nix-zulip

DGNum:lon/nix-openwrt-imagebuilder

DGNum:lon/git-hooks.nix

DGNum:lon/dewclaw

DGNum:lon/colmena

DGNum:lon/cgroup-exporter

DGNum:brotli-disable

DGNum:cellerd

DGNum:lon/poleSubscribe

DGNum:c3nav

DGNum:hypervisor-incus

DGNum:noam

DGNum:temp/hypervisor-tests

DGNum:lon/dgsi

DGNum:traque

DGNum:fai_tomerge

DGNum:bump_nixos_26_05

DGNum:fai

DGNum:grist_update

DGNum:pav01-move

DGNum:lixcon

DGNum:fix_grist_license

DGNum:update_nixos_2511

DGNum:grafana_role_mgmt

DGNum:pipe

DGNum:netgraph

DGNum:move_netbird

DGNum:reaction_ssh

DGNum:forgejo_io_accounting

DGNum:fix_wifi

DGNum:ielo

DGNum:grist

DGNum:nixos-25.11

DGNum:isp/gretap

DGNum:meta/ipam

DGNum:peertube_max_size

DGNum:feat/listmonk

DGNum:bgp_test

DGNum:no-id-list

DGNum:jdl-site

DGNum:gretap

DGNum:takumiv2

DGNum:automatic-updates

DGNum:pkg-update

DGNum:alert-manager-notify

DGNum:jdl01

DGNum:zulip_11_x

DGNum:labrouter-wg

DGNum:declarative-buckets

DGNum:demarches01

DGNum:hypervisor

DGNum:takumi-can-do-ollama

Conversation 0 Commits 33 Files changed 37 +1144 -1335

ecoppens commented 2026-10-19 17:59:59 +02:00

Owner

Copy link

No description provided.

ecoppens added 1 commit 2026-10-19 17:59:59 +02:00

fix: restructure IPAM to be more easier to use 0ab319f4af

ecoppens changed title from fix: restructure IPAM to be more easier to use to WIP: fix: restructure IPAM to be more easier to use 2026-10-20 08:52:13 +02:00

ecoppens added 2 commits 2026-10-20 09:06:08 +02:00

feat(ipam): remove tag system 10a9611f9b

feat(ipam): remove last old IPs 91ba9d4d59

ecoppens added 1 commit 2026-10-20 09:08:52 +02:00

feat(ipam): add check for IPv6 c995f68149

ecoppens added 3 commits 2026-10-20 13:48:23 +02:00

feat(ipam): move IPs into the prefix tree 2334120488

fix(ipam): fix IPAM website generation 07e6cb7326

feat(ipam): populate commented IPs d0119f2042

ecoppens added 1 commit 2026-10-20 14:08:50 +02:00

feat(ipam): populate ipam with data from meta/network cf0316c683

ecoppens force-pushed ipam-v2 from cf0316c683 to a10e950016 2026-10-21 13:35:55 +02:00 Compare

ecoppens force-pushed ipam-v2 from a10e950016 to 75ed93e65b 2026-10-21 13:47:30 +02:00 Compare

ecoppens added 3 commits 2026-10-23 10:09:17 +02:00

feat(net-lib): add toBits function b2775b7541

feat(ipam): add more collision checks 1e1db0941e

fix(ipam): fix collisions 519e4dac3f

ecoppens force-pushed ipam-v2 from 519e4dac3f to 2b89099bf5 2026-10-23 10:26:00 +02:00 Compare

ecoppens added 2 commits 2026-10-23 16:06:03 +02:00

feat(ipam): add getIps methods 44d27b3b0e

fix(network): fix getting IPs for vaults cda6d33063

ecoppens force-pushed ipam-v2 from cda6d33063 to f54c469a0b 2026-10-23 16:06:36 +02:00 Compare

ecoppens added 1 commit 2026-10-23 16:22:33 +02:00

fix(meta): fix verify to remove functions 2772038383

ecoppens force-pushed ipam-v2 from 2772038383 to 4f080deb7b 2026-10-23 16:26:38 +02:00 Compare

ecoppens added 1 commit 2026-10-24 11:40:20 +02:00

feat(ipam): move ipam functions to lib directory 6b454dbd16

ecoppens force-pushed ipam-v2 from 6b454dbd16 to 9ffad851fc 2026-10-24 11:41:41 +02:00 Compare

ecoppens added 1 commit 2026-10-24 11:56:23 +02:00

feat(ipam): move tree functions into lib 9e4e62b30f

ecoppens force-pushed ipam-v2 from 9e4e62b30f to a2f958b6f4 2026-10-24 12:12:00 +02:00 Compare

ecoppens added 2 commits 2026-10-25 20:06:09 +01:00

feat(ipam): add function for /32 subnets a8b8307207

feat(ipam): flatten networks name 2f0831981f

ecoppens force-pushed ipam-v2 from 2f0831981f to 3e09e18765 2026-10-25 22:18:10 +01:00 Compare

ecoppens force-pushed ipam-v2 from 3e09e18765 to 98c948c36d 2026-10-26 09:57:44 +01:00 Compare

ecoppens added 1 commit 2026-10-26 09:58:55 +01:00

fix(ipam): remove subnet v4.internal.vault as it is not used e9b30f3c54

ecoppens added 1 commit 2026-10-26 10:02:33 +01:00

feat(ipam): flatten v4.internal.rooms subnet d2dc9fd246

ecoppens added 1 commit 2026-10-28 15:07:27 +01:00

feat: use new IPAM aad7dee58f

ecoppens force-pushed ipam-v2 from aad7dee58f to d3417c3fa9 2026-10-28 15:08:15 +01:00 Compare

ecoppens force-pushed ipam-v2 from d3417c3fa9 to b1f1b9f982 2026-10-28 15:11:38 +01:00 Compare

ecoppens force-pushed ipam-v2 from b1f1b9f982 to 043bcea29a 2026-10-28 15:12:23 +01:00 Compare

ecoppens force-pushed ipam-v2 from 043bcea29a to d3826cf0cb 2026-10-28 15:16:56 +01:00 Compare

ecoppens force-pushed ipam-v2 from d3826cf0cb to d2e923cf82 2026-10-28 15:19:11 +01:00 Compare

ecoppens force-pushed ipam-v2 from d2e923cf82 to ead19cb590 2026-10-28 15:23:55 +01:00 Compare

ecoppens force-pushed ipam-v2 from ead19cb590 to 962e2cb2ac 2026-10-28 15:25:02 +01:00 Compare

ecoppens force-pushed ipam-v2 from 962e2cb2ac to ad03199af8 2026-10-28 15:26:43 +01:00 Compare

ecoppens force-pushed ipam-v2 from ad03199af8 to cfa9d02830 2026-10-28 15:27:47 +01:00 Compare

ecoppens force-pushed ipam-v2 from cfa9d02830 to 978c3d223e 2026-10-28 15:29:19 +01:00 Compare

ecoppens force-pushed ipam-v2 from 978c3d223e to f25518c078 2026-10-28 15:34:20 +01:00 Compare

ecoppens added 2 commits 2026-10-28 15:39:04 +01:00

feat(ipam): remove all old functions f88c0c6e1e

fix(ipam): fix getIp function e41f33d613

ecoppens force-pushed ipam-v2 from e41f33d613 to 21629eae38 2026-10-28 15:40:01 +01:00 Compare

ecoppens force-pushed ipam-v2 from 21629eae38 to da2b2f41ef 2026-10-28 15:41:02 +01:00 Compare

ecoppens force-pushed ipam-v2 from da2b2f41ef to c3847d62a5 2026-10-28 15:41:44 +01:00 Compare

ecoppens added 1 commit 2026-10-28 15:45:21 +01:00

fix(meta): use mkStringNoPrefix for network gateways a1c1e6c22c

ecoppens added 1 commit 2026-10-28 15:47:26 +01:00

fix(unbound): invert order of IPs to have a minimal diff 3398a10513

ecoppens force-pushed ipam-v2 from 3398a10513 to 0068f6a3d5 2026-10-28 15:57:20 +01:00 Compare

ecoppens force-pushed ipam-v2 from 0068f6a3d5 to fafb6c95f0 2026-10-28 15:59:45 +01:00 Compare

ecoppens force-pushed ipam-v2 from fafb6c95f0 to dd4c453e1b 2026-10-28 16:02:21 +01:00 Compare

ecoppens force-pushed ipam-v2 from dd4c453e1b to c019581b3f 2026-10-28 16:04:34 +01:00 Compare

thubrecht added 1 commit 2026-10-28 16:46:55 +01:00

nixopts-search: add the required ipam specialArg for meta documentation 946666ea5b

thubrecht force-pushed ipam-v2 from 946666ea5b to c8efae944f 2026-11-01 13:41:32 +01:00 Compare

ecoppens force-pushed ipam-v2 from c8efae944f to 3adbe771fe 2026-11-01 14:09:29 +01:00 Compare

ecoppens added 1 commit 2026-11-01 15:15:23 +01:00

feat(meta): move last public IPs to IPAM a6ccad7242

ecoppens force-pushed ipam-v2 from a6ccad7242 to f2656f48e4 2026-11-01 15:17:46 +01:00 Compare

ecoppens force-pushed ipam-v2 from f2656f48e4 to 93e4d596eb 2026-11-01 15:21:09 +01:00 Compare

ecoppens added 1 commit 2026-11-01 15:35:37 +01:00

feat(meta): move netbird IPs to IPAM 4cdc000beb

ecoppens force-pushed ipam-v2 from 4cdc000beb to d33d5a0f17 2026-11-01 15:51:54 +01:00 Compare

ecoppens added 1 commit 2026-11-01 15:54:17 +01:00

nixopts-search: add the required ipam specialArg for meta documentation ... b397474fa1

Co-Authored-by: Tom Hubrecht <tom.hubrecht@dgnum.eu>

ecoppens changed title from WIP: fix: restructure IPAM to be more easier to use to fix: restructure IPAM to be more easier to use 2026-11-01 15:57:29 +01:00

ecoppens requested reviews from thubrecht, mdebray 2026-11-01 15:57:48 +01:00

ecoppens added 1 commit 2026-11-02 16:28:30 +01:00

feat: move admin IPs to IPAM b8aa89da01

ecoppens force-pushed ipam-v2 from b8aa89da01 to 46293916f7 2026-11-04 20:45:56 +01:00 Compare

All checks were successful

Hide checks

Check workflows / check_workflows (pull_request) Successful in 6s

Required

Details

Check meta / check_meta (pull_request) Successful in 14s

Required

Details

Run pre-commit on all files / pre-commit (push) Successful in 16s

Required

Details

Build all the nodes / AP-montrouge (pull_request) Successful in 29s

Required

Details

Build all the nodes / AP-pantheon (pull_request) Successful in 31s

Required

Details

Build all the nodes / AP-test (pull_request) Successful in 30s

Required

Details

Build all the nodes / sw-Pantheon (pull_request) Successful in 26s

Required

Details

Build all the nodes / optic-loop (pull_request) Successful in 27s

Required

Details

Build all the nodes / sw-Jourdan (pull_request) Successful in 26s

Required

Details

Build all the nodes / sw-Montrouge (pull_request) Successful in 26s

Required

Details

Build all the nodes / jeux02 (pull_request) Successful in 29s

Required

Details

Build all the nodes / sw-Test (pull_request) Successful in 26s

Required

Details

Build all the nodes / AP-jourdan (pull_request) Successful in 32s

Required

Details

Build all the nodes / geo02 (pull_request) Successful in 32s

Required

Details

Build all the nodes / build01 (pull_request) Successful in 32s

Required

Details

Build all the nodes / bridge01 (pull_request) Successful in 32s

Required

Details

Show derivation diffs / AP-jourdan (pull_request) Successful in 30s

Details

Build all the nodes / geo01 (pull_request) Successful in 35s

Required

Details

Build all the nodes / external01 (pull_request) Successful in 35s

Required

Details

Build all the nodes / cof02 (pull_request) Successful in 36s

Required

Details

Show derivation diffs / AP-pantheon (pull_request) Successful in 32s

Details

Show derivation diffs / AP-test (pull_request) Successful in 32s

Details

Show derivation diffs / AP-montrouge (pull_request) Successful in 33s

Details

Build all the nodes / storage01 (pull_request) Successful in 34s

Required

Details

Build all the nodes / tower01 (pull_request) Successful in 32s

Required

Details

Build all the nodes / hypervisors1 (pull_request) Successful in 40s

Required

Details

Build all the nodes / hypervisors0 (pull_request) Successful in 41s

Required

Details

Build all the nodes / iso (pull_request) Successful in 41s

Required

Details

Build all the nodes / krz01 (pull_request) Successful in 39s

Required

Details

Build all the nodes / compute01 (pull_request) Successful in 46s

Required

Details

Build all the nodes / vault03 (pull_request) Successful in 46s

Required

Details

Run pre-commit on all files / pre-commit (pull_request) Successful in 27s

Required

Details

Build all the nodes / vault01 (pull_request) Successful in 47s

Required

Details

Build the shell / build-shell (pull_request) Successful in 29s

Required

Details

Show derivation diffs / bridge01 (pull_request) Successful in 53s

Details

Build all the nodes / vault02 (pull_request) Successful in 47s

Required

Details

Build all the nodes / web02 (pull_request) Successful in 51s

Required

Details

Build all the nodes / web03 (pull_request) Successful in 58s

Required

Details

Build all the nodes / vault99 (pull_request) Successful in 1m0s

Required

Details

Build all the nodes / web01 (pull_request) Successful in 1m0s

Required

Details

Show derivation diffs / build01 (pull_request) Successful in 1m3s

Details

Show derivation diffs / external01 (pull_request) Successful in 53s

Details

Show derivation diffs / cof02 (pull_request) Successful in 1m14s

Details

Show derivation diffs / geo02 (pull_request) Successful in 50s

Details

Show derivation diffs / geo01 (pull_request) Successful in 51s

Details

Show derivation diffs / optic-loop (pull_request) Successful in 12s

Details

Show derivation diffs / hypervisors0 (pull_request) Successful in 1m4s

Details

Show derivation diffs / compute01 (pull_request) Successful in 1m20s

Details

Show derivation diffs / sw-Jourdan (pull_request) Successful in 14s

Details

Show derivation diffs / hypervisors1 (pull_request) Successful in 59s

Details

Show derivation diffs / sw-Montrouge (pull_request) Successful in 12s

Details

Show derivation diffs / jeux02 (pull_request) Successful in 35s

Details

Show derivation diffs / iso (pull_request) Successful in 50s

Details

Show derivation diffs / sw-Pantheon (pull_request) Successful in 22s

Details

Show derivation diffs / krz01 (pull_request) Successful in 53s

Details

Show derivation diffs / sw-Test (pull_request) Successful in 22s

Details

Show derivation diffs / storage01 (pull_request) Successful in 45s

Details

Show derivation diffs / tower01 (pull_request) Successful in 38s

Details

Show derivation diffs / vault02 (pull_request) Successful in 56s

Details

Show derivation diffs / web02 (pull_request) Successful in 39s

Details

Show derivation diffs / vault03 (pull_request) Successful in 55s

Details

Show derivation diffs / vault01 (pull_request) Successful in 1m0s

Details

Show derivation diffs / web03 (pull_request) Successful in 48s

Details

Show derivation diffs / vault99 (pull_request) Successful in 57s

Details

Show derivation diffs / web01 (pull_request) Successful in 1m10s

Details

This pull request can be merged automatically.

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin ipam-v2:ipam-v2

git switch ipam-v2

Sign in to join this conversation.

Reviewers

No reviewers

mdebray

thubrecht

Labels

Clear labels   

awaiting

awaiting-author

Awaiting for the author interaction (e.g. QA/confirmation/final merge)

  

awaiting

awaiting-reviewer

Awaiting for a privileged reviewer to approve this PR

  

bot

Pull Request opened by a bot

  

deployed

This PR is currently deployed on the infra

  

Silenced alert

This is a known and silenced alert.

  

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

awaiting

awaiting-author

awaiting

awaiting-reviewer

bot

deployed

Silenced alert

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

DGNum/infrastructure!866

No description provided.