Merge pull request #6 from ruby-no-kai/kea2025

rk25net: dhcp

Author: sorah

.github/workflows/docker-build-simple.libsonnet

@@ -59,6 +59,8 @@ function(name, region='ap-northeast-1', platforms=['linux/arm64']) {
             context: std.format('{{defaultContext}}:%s', name),
             platforms: '${{ matrix.platform }}',
             outputs: std.format('type=image,"name=${{ steps.login-ecr.outputs.registry }}/%s",push-by-digest=true,name-canonical=true,push=true', name),
+            'cache-from': 'type=gha',
+            'cache-to': 'type=gha,mode=max',
           },
         },
         {

.github/workflows/docker-kea.yml

@@ -4,7 +4,7 @@ ARG BASE=public.ecr.aws/ubuntu/ubuntu:24.04
 
 ###
 
-FROM public.ecr.aws/docker/library/rust:1.77-slim-bullseye as build-healthz
+FROM public.ecr.aws/docker/library/rust:1.85-slim-bookworm as build-healthz
 
 WORKDIR /build/healthz
 COPY healthz/ ./
@@ -21,7 +21,7 @@ RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends git rake build-essential wget unzip python3
 
 WORKDIR /build
-RUN git clone --depth=1 https://gitlab.isc.org/isc-projects/stork -b v1.15.0
+RUN git clone --depth=1 https://gitlab.isc.org/isc-projects/stork -b v2.1.1
 
 WORKDIR /build/stork/backend
 ENV GOPATH=/build/go

kea/Dockerfile

@@ -1,17 +1,26 @@
 #!/usr/bin/env ruby
 require 'ipaddr'
+require 'json'
 
 dev = IO.popen(%w(ip -o route get 8.8.8.8), 'r', &:read).match(/dev ([^ ]+)/)[1].chomp
 addr = IO.popen([*%w(ip -o address show dev), dev], 'r', &:read).match(/inet ([^ ]+)/)[1].chomp
-net = IPAddr.new(addr)
+#addr = '10.33.137.193'
+this = IPAddr.new(addr)
 
-candidates = ENV.fetch('DHCP_SERVER_IDS', '').split(',')
+#ENV['DHCP_SERVER_IDS'] = '10.33.136.67/21,10.33.152.67/21'
+candidates = ENV['DHCP_SERVER_IDS']&.then { _1.split(',') } || begin
+  JSON.parse(File.read('/server-ids/server-ids.json')).fetch('server_ids')
+end
+warn(JSON.generate(this:, server_id_candidates: candidates))
 
 candidates.each do |candidate|
-  if net.include?(IPAddr.new(candidate))
-    puts candidate
+  warn(JSON.generate(try: {candidate: candidate, this:}))
+  if IPAddr.new(candidate).include?(this)
+    warn(JSON.generate(server_id_chosen: candidate))
+    puts candidate.split(?/)[0]
     exit
   end
 end
 
+warn(JSON.generate(server_id_unchosen: addr, this:))
 puts addr.split(?/)[0]