feat: add support for resizing on Kubernetes 1.32

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
 
       - name: Install protoc-gen-go
         run: |
-          go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31
+          go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.3
           go install github.com/containerd/ttrpc/cmd/[email protected]
 
       - uses: awalsh128/cache-apt-pkgs-action@v1

activator/activator_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -31,7 +32,7 @@ func TestActivator(t *testing.T) {
 	s, err := NewServer(ctx, nn)
 	require.NoError(t, err)
 
-	bpf, err := InitBPF(os.Getpid())
+	bpf, err := InitBPF(os.Getpid(), slog.Default())
 	require.NoError(t, err)
 	require.NoError(t, bpf.AttachRedirector("lo"))
 

activator/bpf.go

@@ -25,9 +25,10 @@ type BPF struct {
 	objs    *bpfObjects
 	qdiscs  []*netlink.GenericQdisc
 	filters []*netlink.BpfFilter
+	log     *slog.Logger
 }
 
-func InitBPF(pid int) (*BPF, error) {
+func InitBPF(pid int, log *slog.Logger) (*BPF, error) {
 	// Allow the current process to lock memory for eBPF resources.
 	if err := rlimit.RemoveMemlock(); err != nil {
 		return nil, err
@@ -49,7 +50,7 @@ func InitBPF(pid int) (*BPF, error) {
 		return nil, fmt.Errorf("loading objects: %w", err)
 	}
 
-	return &BPF{pid: pid, objs: &objs}, nil
+	return &BPF{pid: pid, log: log, objs: &objs}, nil
 }
 
 func (bpf *BPF) Cleanup() error {
@@ -68,7 +69,7 @@ func (bpf *BPF) Cleanup() error {
 		}
 	}
 
-	slog.Info("deleting", "path", PinPath(bpf.pid))
+	bpf.log.Info("deleting", "path", PinPath(bpf.pid))
 	return os.RemoveAll(PinPath(bpf.pid))
 }
 

cmd/manager/main.go

@@ -25,16 +25,18 @@ var (
 func main() {
 	flag.Parse()
 
+	opts := &slog.HandlerOptions{}
 	if *debug {
-		slog.SetLogLoggerLevel(slog.LevelDebug)
+		opts.Level = slog.LevelDebug
 	}
-	slog.Info("starting manager", "metrics-addr", *metricsAddr)
+	log := slog.New(slog.NewJSONHandler(os.Stdout, opts))
+	log.Info("starting manager", "metrics-addr", *metricsAddr)
 
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
 	defer stop()
 
-	if err := manager.AttachRedirectors(ctx); err != nil {
-		slog.Error("attaching redirectors", "err", err)
+	if err := manager.AttachRedirectors(ctx, log); err != nil {
+		log.Error("attaching redirectors", "err", err)
 		os.Exit(1)
 	}
 
@@ -46,13 +48,13 @@ func main() {
 
 	podHandlers := []manager.PodHandler{}
 	if *statusLabels {
-		podHandlers = append(podHandlers, manager.NewPodLabeller())
+		podHandlers = append(podHandlers, manager.NewPodLabeller(log))
 	}
 	if *inPlaceScaling {
-		podHandlers = append(podHandlers, manager.NewPodScaler())
+		podHandlers = append(podHandlers, manager.NewPodScaler(log))
 	}
 
-	if err := manager.StartSubscribers(ctx, podHandlers...); err != nil {
+	if err := manager.StartSubscribers(ctx, log, podHandlers...); err != nil {
 		slog.Error("starting subscribers", "err", err)
 		os.Exit(1)
 	}

config/pod-updater/rbac.yaml

@@ -8,6 +8,7 @@ rules:
       - ""
     resources:
       - pods
+      - pods/resize
     verbs:
       - get
       - update

e2e/kind.yaml

@@ -2,8 +2,10 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 featureGates:
   InPlacePodVerticalScaling: true
+  InPlacePodVerticalScalingAllocatedStatus: true
 nodes:
   - role: control-plane
+    image: kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
     extraMounts:
       - hostPath: /proc
         containerPath: /host/proc