Merge branch 'main' into chore/upgrade-all-k8s-1.29

.github/workflows/build-images.yaml

@@ -137,7 +137,7 @@ jobs:
           echo "info=$(git describe --tags --long --dirty)" >> $GITHUB_OUTPUT
 
       - name: set custom docker config directory
-        uses: ./.github/actions/set-docker-config-dir
+        uses: neondatabase/dev-actions/set-docker-config-dir@6094485bf440001c94a94a3f9e221e81ff6b6193
 
       - uses: docker/setup-buildx-action@v3
         with:

.github/workflows/build-test-vm.yaml

@@ -75,7 +75,7 @@ jobs:
           retention-days: 2
 
       - name: set custom docker config directory
-        uses: ./.github/actions/set-docker-config-dir
+        uses: neondatabase/dev-actions/set-docker-config-dir@6094485bf440001c94a94a3f9e221e81ff6b6193
 
       - name: login to docker hub
         uses: docker/login-action@v3

.github/workflows/check-ca-builds.yaml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: set custom docker config directory
-        uses: ./.github/actions/set-docker-config-dir
+        uses: neondatabase/dev-actions/set-docker-config-dir@6094485bf440001c94a94a3f9e221e81ff6b6193
 
       - uses: docker/setup-buildx-action@v3
       - name: Login to Docker cache registry

.github/workflows/e2e-test.yaml

@@ -132,7 +132,7 @@ jobs:
           retention-days: 2 # minimum is 1 day; 0 is default. These are only used temporarily.
 
       - name: set custom docker config directory
-        uses: ./.github/actions/set-docker-config-dir
+        uses: neondatabase/dev-actions/set-docker-config-dir@6094485bf440001c94a94a3f9e221e81ff6b6193
 
       - uses: docker/login-action@v3
         with:

.github/workflows/vm-example.yaml

@@ -3,6 +3,9 @@ name: vm-example
 on:
   schedule:
     - cron:  '42 4 * * 2'  # run once a week
+  pull_request:
+    paths:
+      - ".github/workflows/vm-example.yaml"
   workflow_dispatch: # adds ability to run this manually
 
 jobs:
@@ -19,6 +22,9 @@ jobs:
           go-version-file: 'go.mod'
         timeout-minutes: 10
 
+      - name: build daemon
+        run:  make docker-build-daemon
+
       - name: build vm-builder
         run:  make bin/vm-builder
 

.github/workflows/vm-kernel.yaml

@@ -138,7 +138,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: set custom docker config directory
-        uses: ./.github/actions/set-docker-config-dir
+        uses: neondatabase/dev-actions/set-docker-config-dir@6094485bf440001c94a94a3f9e221e81ff6b6193
 
       - name: docker - setup buildx
         uses: docker/setup-buildx-action@v3

.golangci.yml

@@ -25,6 +25,7 @@ linters:
     - staticcheck # some rules from staticcheck.io
     - typecheck   # typechecks code, like the compiler
     - unused      # checks for unused constants/variables/functions/types
+    - gofumpt     # Formatter.
 
     # explicitly enabled:
     - asciicheck       # all identifiers are ASCII

Makefile

@@ -17,7 +17,7 @@ PG16_DISK_TEST_IMG ?= pg16-disk-test:dev
 GOARCH ?= $(shell go env GOARCH)
 GOOS ?= $(shell go env GOOS)
 
-# The target architecture for linux kernel. Possible values: amd64 or arm64. 
+# The target architecture for linux kernel. Possible values: amd64 or arm64.
 # Any other supported by linux kernel architecture could be added by introducing new build step into neonvm/hack/kernel/Dockerfile.kernel-builder
 KERNEL_TARGET_ARCH ?= amd64
 
@@ -33,6 +33,8 @@ endif
 # https://github.com/neondatabase/autoscaling/pull/130#issuecomment-1496276620
 export GOFLAGS=-buildvcs=false
 
+GOFUMPT_VERSION ?= v0.7.0
+
 # Setting SHELL to bash allows bash commands to be executed by recipes.
 # Options are set to exit when a recipe line exits non-zero or a piped command fails.
 SHELL = /usr/bin/env bash -o pipefail
@@ -108,7 +110,7 @@ generate: ## Generate boilerplate DeepCopy methods, manifests, and Go client
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
-	go fmt ./...
+	go run mvdan.cc/gofumpt@${GOFUMPT_VERSION} -w .
 
 .PHONY: vet
 vet: ## Run go vet against code.
@@ -119,7 +121,7 @@ vet: ## Run go vet against code.
 
 TESTARGS ?= ./...
 .PHONY: test
-test: fmt vet envtest ## Run tests.
+test: vet envtest ## Run tests.
 	# chmodding KUBEBUILDER_ASSETS dir to make it deletable by owner,
 	# otherwise it fails with actions/checkout on self-hosted GitHub runners
 	# 	ref: https://github.com/kubernetes-sigs/controller-runtime/pull/2245
@@ -132,16 +134,19 @@ test: fmt vet envtest ## Run tests.
 ##@ Build
 
 .PHONY: build
-build: fmt vet bin/vm-builder ## Build all neonvm binaries.
-	GOOS=linux go build -o bin/controller       neonvm/main.go
-	GOOS=linux go build -o bin/vxlan-controller neonvm/tools/vxlan/controller/main.go
-	GOOS=linux go build -o bin/runner           neonvm/runner/*.go
+build: vet bin/vm-builder ## Build all neonvm binaries.
+	GOOS=linux go build -o bin/controller         neonvm-controller/cmd/main.go
+	GOOS=linux go build -o bin/vxlan-controller   neonvm-vxlan-controller/cmd/main.go
+	GOOS=linux go build -o bin/runner             neonvm-runner/cmd/main.go
+	GOOS=linux go build -o bin/daemon             neonvm-daemon/cmd/main.go
+	GOOS=linux go build -o bin/autoscaler-agent   autoscaler-agent/cmd/main.go
+	GOOS=linux go build -o bin/scheduler          autoscale-scheduler/cmd/main.go
 
 .PHONY: bin/vm-builder
 bin/vm-builder: ## Build vm-builder binary.
-	GOOS=linux CGO_ENABLED=0 go build -o bin/vm-builder -ldflags "-X main.Version=${GIT_INFO} -X main.NeonvmDaemonImage=${IMG_DAEMON}" vm-builder/main.go 
+	GOOS=linux CGO_ENABLED=0 go build -o bin/vm-builder -ldflags "-X main.Version=${GIT_INFO} -X main.NeonvmDaemonImage=${IMG_DAEMON}" vm-builder/main.go
 .PHONY: run
-run: fmt vet ## Run a controller from your host.
+run: vet ## Run a controller from your host.
 	go run ./neonvm/main.go
 
 .PHONY: lint

autoscale-scheduler/deployment.yaml

@@ -63,3 +63,13 @@ spec:
         - name: plugin-config-volume
           configMap:
             name: scheduler-plugin-config
+
+      tolerations:
+        # Add explicit (short) tolerations for node failure, because otherwise the default of 5m
+        # will be used, which is unacceptably long for us.
+        - key: node.kubernetes.io/not-ready
+          tolerationSeconds: 30
+          effect: NoExecute
+        - key: node.kubernetes.io/unreachable
+          tolerationSeconds: 30
+          effect: NoExecute

cluster-autoscaler/ca.branch

@@ -1 +1 @@
-cluster-autoscaler-release-1.29
+cluster-autoscaler-release-1.29

cluster-autoscaler/ca.commit

@@ -1 +1 @@
-d4bbc686ac02a77a6ad1362fe7bbda387e8f074a
+d4bbc686ac02a77a6ad1362fe7bbda387e8f074a

neonvm-runner/cmd/main.go

@@ -180,7 +180,7 @@ func getLines(input []byte, commentMarker []byte) [][]byte {
 	lines := bytes.Split(input, []byte("\n"))
 	var output [][]byte
 	for _, currentLine := range lines {
-		var commentIndex = bytes.Index(currentLine, commentMarker)
+		commentIndex := bytes.Index(currentLine, commentMarker)
 		if commentIndex == -1 {
 			output = append(output, currentLine)
 		} else {
@@ -335,7 +335,7 @@ func createISO9660runtime(
 		}
 	}
 
-	outputFile, err := os.OpenFile(diskPath, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
+	outputFile, err := os.OpenFile(diskPath, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0o644)
 	if err != nil {
 		return err
 	}
@@ -534,7 +534,7 @@ func createISO9660FromPath(logger *zap.Logger, diskName string, diskPath string,
 		}
 	}
 
-	outputFile, err := os.OpenFile(diskPath, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
+	outputFile, err := os.OpenFile(diskPath, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0o644)
 	if err != nil {
 		return err
 	}
@@ -1733,7 +1733,7 @@ func defaultNetwork(logger *zap.Logger, cidr string, ports []vmv1.Port) (mac.MAC
 	// Adding VM's IP address to the /etc/hosts, so we can access it easily from
 	// the pod. This is particularly useful for ssh into the VM from the runner
 	// pod.
-	f, err := os.OpenFile("/etc/hosts", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	f, err := os.OpenFile("/etc/hosts", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		return nil, err
 	}

neonvm-vxlan-controller/cmd/main.go

@@ -31,9 +31,7 @@ const (
 	extraNetCidr      = "10.100.0.0/16"
 )
 
-var (
-	deleteIfaces = flag.Bool("delete", false, `delete VXLAN interfaces`)
-)
+var deleteIfaces = flag.Bool("delete", false, `delete VXLAN interfaces`)
 
 func main() {
 	flag.Parse()
@@ -192,7 +190,6 @@ func createVxlanInterface(name string, vxlanID int, ownIP string, bridgeName str
 }
 
 func updateFDB(vxlanName string, nodeIPs []string, ownIP string) error {
-
 	broadcastFdbMac, _ := net.ParseMAC("00:00:00:00:00:00")
 
 	// get vxlan interface details
@@ -248,7 +245,6 @@ func deleteLink(name string) error {
 }
 
 func upsertIptablesRules() error {
-
 	// manage iptables
 	ipt, err := iptables.New(iptables.IPFamily(iptables.ProtocolIPv4), iptables.Timeout(5))
 	if err != nil {

neonvm/apis/neonvm/v1/webhook_suite_test.go

@@ -44,11 +44,13 @@ import (
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
 // http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
 
-var cfg *rest.Config
-var k8sClient client.Client
-var testEnv *envtest.Environment
-var ctx context.Context
-var cancel context.CancelFunc
+var (
+	cfg       *rest.Config
+	k8sClient client.Client
+	testEnv   *envtest.Environment
+	ctx       context.Context
+	cancel    context.CancelFunc
+)
 
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
@@ -127,7 +129,6 @@ var _ = BeforeSuite(func() {
 		conn.Close()
 		return nil
 	}).Should(Succeed())
-
 })
 
 var _ = AfterSuite(func() {