neonvm: apply ci fixes for extracted control daemon

Signed-off-by: Misha Sakhnov <[email protected]>

Author: mikhail-sakhnov

.github/workflows/build-images.yaml

@@ -46,6 +46,9 @@ on:
       autoscaler-agent:
         description: 'autoscaler-agent image'
         value: ${{ jobs.tags.outputs.autoscaler-agent }}
+      daemon:
+        description: 'neonvm-daemon image'
+        value: ${{ jobs.tags.outputs.daemon }}
 
 env:
   IMG_CONTROLLER:         "neondatabase/neonvm-controller"
@@ -79,6 +82,7 @@ jobs:
       scheduler:          ${{ steps.show-tags.outputs.scheduler }}
       autoscaler-agent:   ${{ steps.show-tags.outputs.autoscaler-agent }}
       cluster-autoscaler: ${{ steps.show-tags.outputs.cluster-autoscaler }}
+      daemon:             ${{ steps.show-tags.outputs.daemon}}
     runs-on: ubuntu-latest
     steps:
       - id: show-tags
@@ -241,6 +245,8 @@ jobs:
           push: true
           file: neonvm/daemon/Dockerfile
           tags: ${{ needs.tags.outputs.daemon }}
+          build-args: |
+            GO_BASE_IMG=${{ env.GO_BASE_IMG }}
 
       - name: Generate neonvm-controller build tags
         id: controller-build-tags

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

@@ -29,6 +29,7 @@ on:
 
 env:
   IMG_POSTGRES_16_BULLSEYE: "neondatabase/vm-postgres-16-bullseye"
+  IMG_DAEMON: "neondatabase/neonvm-daemon"
 
 defaults:
   run:
@@ -38,11 +39,13 @@ jobs:
   tags:
     outputs:
       vm-postgres-16-bullseye: ${{ steps.show-tags.outputs.vm-postgres-16-bullseye }}
+      daemon: ${{ steps.show-tags.outputs.daemon }}
     runs-on: ubuntu-latest
     steps:
       - id: show-tags
         run: |
           echo "vm-postgres-16-bullseye=${{ env.IMG_POSTGRES_16_BULLSEYE }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
+          echo "daemon=${{ env.IMG_DAEMON }}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
 
   build:
     # nb: use format(..) to catch both inputs.skip = true AND inputs.skip = 'true'.
@@ -81,7 +84,7 @@ jobs:
 
       - name: build ${{ needs.tags.outputs.vm-postgres-16-bullseye }}
         run: |
-          ./bin/vm-builder -src postgres:16-bullseye -spec tests/e2e/image-spec.yaml -dst ${{ needs.tags.outputs.vm-postgres-16-bullseye }}
+          ./bin/vm-builder -src postgres:16-bullseye -spec tests/e2e/image-spec.yaml -dst ${{ needs.tags.outputs.vm-postgres-16-bullseye }} -daemon-image ${{ needs.tags.outputs.daemon }}
       - name: docker push ${{ needs.tags.outputs.vm-postgres-16-bullseye }}
         run: |
           docker push ${{ needs.tags.outputs.vm-postgres-16-bullseye }}

Makefile

@@ -133,7 +133,7 @@ build: fmt vet bin/vm-builder ## Build all neonvm binaries.
 	GOOS=linux go build -o bin/runner           neonvm/runner/*.go
 
 .PHONY: bin/vm-builder
-bin/vm-builder: docker-build-daemon ## Build vm-builder binary.
+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}" neonvm/tools/vm-builder/main.go
 
 .PHONY: run
@@ -185,7 +185,11 @@ docker-build-runner: docker-build-go-base ## Build docker image for NeonVM runne
 
 .PHONY: docker-build-daemon
 docker-build-daemon: ## Build docker image for NeonVM daemon.
-	docker build -t $(IMG_DAEMON) -f neonvm/daemon/Dockerfile .
+	docker build \
+		--tag $(IMG_DAEMON) \
+		--build-arg GO_BASE_IMG=$(GO_BASE_IMG) \
+		--file neonvm/daemon/Dockerfile \
+		.
 
 .PHONY: docker-build-vxlan-controller
 docker-build-vxlan-controller: docker-build-go-base ## Build docker image for NeonVM vxlan controller