feat: add finch-daemon #1181
+162
−5
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,9 @@ VERSION_INJECTION += -X $(PACKAGE)/pkg/version.GitCommit=$(GITCOMMIT) | |
| LDFLAGS = "-w $(VERSION_INJECTION)" | ||
| MIN_MACOS_VERSION ?= 11.0 | ||
|
|
||
| FINCH_DAEMON_LOCATION_ROOT ?= $(FINCH_OS_IMAGE_LOCATION_ROOT)/finch-daemon | ||
| FINCH_DAEMON_LOCATION ?= $(FINCH_DAEMON_LOCATION_ROOT)/finch-daemon | ||
|
|
||
| GOOS ?= $(shell $(GO) env GOOS) | ||
| ifeq ($(GOOS),windows) | ||
| BINARYNAME := $(addsuffix .exe, $(BINARYNAME)) | ||
|
|
@@ -75,7 +78,7 @@ endif | |
|
|
||
| FINCH_CORE_DIR := $(CURDIR)/deps/finch-core | ||
|
|
||
| remote-all: arch-test finch install.finch-core-dependencies finch.yaml networks.yaml config.yaml $(OUTDIR)/finch-daemon/[email protected] | ||
|
|
||
| ifeq ($(BUILD_OS), Windows_NT) | ||
| include Makefile.windows | ||
|
|
@@ -174,6 +177,9 @@ finch-all: | |
| .PHONY: release | ||
| release: check-licenses all download-licenses | ||
|
|
||
| $(OUTDIR)/finch-daemon/[email protected]: | ||
| cp [email protected] $(OUTDIR)/finch-daemon/[email protected] | ||
|
|
||
| .PHONY: coverage | ||
| coverage: | ||
| go test $(shell go list ./... | grep -v e2e | grep -v benchmark | grep -v mocks) -coverprofile=test-coverage.out | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| //go:build darwin | ||
|
|
||
| package vm | ||
|
|
||
| import ( | ||
| "context" | ||
| "path/filepath" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "github.com/docker/docker/api/types/image" | ||
| "github.com/docker/docker/client" | ||
| "github.com/onsi/ginkgo/v2" | ||
| "github.com/onsi/gomega" | ||
| "github.com/runfinch/common-tests/option" | ||
| ) | ||
|
|
||
| var testDaemon = func(_ *option.Option, installed bool) { | ||
| imageRef := "public.ecr.aws/docker/library/alpine:latest" | ||
| ginkgo.Describe("Daemon smoke test", func() { | ||
| ginkgo.It("docker client should be able to pull and list images", func(gCtx ginkgo.SpecContext) { | ||
| // create a context which is cancelled with the ginkgo test timeout | ||
| testCtx, cancelCtx := context.WithCancel(context.Background()) | ||
| defer cancelCtx() | ||
| go func() { | ||
| defer cancelCtx() | ||
| <-gCtx.Done() | ||
| }() | ||
|
|
||
| daemonSocketPath := filepath.Join(limaDataDirPath(installed), "finch", "sock", "finch.sock") | ||
| apiClient, err := client.NewClientWithOpts( | ||
| client.WithHost("unix://"+daemonSocketPath), | ||
| client.WithVersion("v1.43"), | ||
| ) | ||
| gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) | ||
| defer func() { | ||
| gomega.Expect(apiClient.Close()).ShouldNot(gomega.HaveOccurred()) | ||
| }() | ||
|
|
||
| _, err = apiClient.ImagePull(testCtx, imageRef, image.PullOptions{}) | ||
| gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) | ||
|
|
||
| // ImagePull is asynchronous -- poll to check that the image has been pulled every second | ||
| imagePulled := false | ||
| wg := sync.WaitGroup{} | ||
| wg.Add(1) | ||
| go func(wg *sync.WaitGroup) { | ||
| for { | ||
| time.Sleep(1 * time.Second) | ||
| images, err := apiClient.ImageList(testCtx, image.ListOptions{}) | ||
| if err != nil { | ||
| gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) | ||
| } | ||
| for _, img := range images { | ||
| for _, tag := range img.RepoTags { | ||
| if tag == imageRef { | ||
| imagePulled = true | ||
| wg.Done() | ||
| return | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }(&wg) | ||
| wg.Wait() | ||
|
|
||
| gomega.Expect(imagePulled).Should(gomega.BeTrue()) | ||
| }) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| mounts: | ||
| - location: "<finch_daemon_root>" | ||
| writable: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,14 @@ provision: | |
| - mode: boot | ||
| script: | | ||
| modprobe virtiofs | ||
| # port this to common.yaml after windows socket forwarding is added | ||
| - mode: user | ||
| script: | | ||
| sudo cp <finch_daemon_location> /usr/local/bin/finch-daemon | ||
| sudo cp <finch_daemon_root>/[email protected] /usr/local/lib/systemd/system/[email protected] | ||
|
|
||
| sudo systemctl daemon-reload | ||
| sudo systemctl enable --now finch@${UID} | ||
| mounts: | ||
| - location: "~" | ||
| mountPoint: null | ||
|
|
@@ -22,9 +30,9 @@ mounts: | |
| cache: "fscache" | ||
| - location: "/tmp/lima" | ||
| writable: true | ||
| - location: "/private" | ||
| writable: true | ||
| - location: "/var/folders" | ||
| writable: true | ||
|
|
||
| ssh: | ||
|
|
@@ -44,3 +52,7 @@ hostResolver: | |
| hosts: | ||
| host.finch.internal: host.lima.internal | ||
| host.docker.internal: host.lima.internal | ||
|
|
||
| portForwards: | ||
| - guestSocket: "/run/finch.sock" | ||
| hostSocket: "{{.Dir}}/sock/finch.sock" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| [Unit] | ||
| Description=Finch daemon %I | ||
| Documentation=https://runfinch.com https://github.com/runfinch/finch-daemon | ||
| After=network.target local-fs.target containerd.service buildkit.service | ||
|
There was a problem hiding this comment. Can we make use of finch-daemon socket activation? There was a problem hiding this comment. Not blocking. We can do it as a follow up. |
||
|
|
||
| [Service] | ||
| ExecStart=/usr/local/bin/finch-daemon --socket-owner %i | ||
| ExecStartPost=-rm -rf /var/run/docker.sock | ||
| ExecStartPost=ln -s /run/finch.sock /var/run/docker.sock | ||
Shubhranshu153 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Type=notify | ||
| Delegate=yes | ||
| Restart=always | ||
| RestartSec=5 | ||
|
|
||
| [Install] | ||
| WantedBy=multi-user.target | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really need separate targets for
networks.yaml,config.yaml,$(OUTDIR)/finch-daemon/[email protected]?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think anything that writes a file should probably have its own rule so that its not re-created unless the file is deleted