From b50da53a83f1c88679d4a6fe39d6382a1ff8c886 Mon Sep 17 00:00:00 2001 From: Richard Case Date: Tue, 9 Jul 2024 09:56:23 +0100 Subject: [PATCH] chore: rename after org change (#853) Various changes made after the GitHub org name changed. The changes include Go packagae names/import, contaienr images names etc. Signed-off-by: Richard Case --- .github/ISSUE_TEMPLATE/bug_report.md | 10 +- .github/ISSUE_TEMPLATE/feature_request.md | 6 +- .github/workflows/dependabot_bundler.yml | 4 +- .github/workflows/deploy-docs.yaml | 12 +- .github/workflows/fork.yaml | 130 +++++------ .github/workflows/nightly_e2e.yml | 82 +++---- .golangci.yml | 134 +++++------ CODE_OF_CONDUCT.md | 7 +- CONTRIBUTING.md | 218 +++++++++--------- Makefile | 14 +- README.md | 30 ++- api/go.mod | 2 +- api/services/microvm/v1alpha1/microvms.pb.go | 33 ++- api/services/microvm/v1alpha1/microvms.proto | 2 +- api/types/microvm.pb.go | 10 +- api/types/microvm.proto | 2 +- buf.lock | 4 +- buf.yaml | 2 +- client/cloudinit/instance/metadata_test.go | 2 +- client/go.mod | 2 +- cmd/flintlock-metrics/main.go | 2 +- cmd/flintlockd/main.go | 2 +- core/application/app.go | 2 +- core/application/app_test.go | 16 +- core/application/commands.go | 18 +- core/application/errors.go | 2 +- core/application/query.go | 6 +- core/application/reconcile.go | 16 +- core/models/network_test.go | 2 +- core/models/vmid.go | 4 +- core/models/vmid_test.go | 2 +- core/plans/helper_test.go | 6 +- core/plans/matcher_test.go | 4 +- core/plans/microvm_create_update.go | 22 +- core/plans/microvm_create_update_test.go | 8 +- core/plans/microvm_delete.go | 22 +- core/plans/microvm_delete_test.go | 10 +- core/plans/types.go | 2 +- core/ports/context/context.go | 2 +- core/ports/repositories.go | 2 +- core/ports/services.go | 6 +- core/ports/usecases.go | 2 +- core/steps/cloudinit/disk_mount.go | 10 +- core/steps/event/publish.go | 6 +- core/steps/event/publish_test.go | 6 +- core/steps/microvm/create.go | 10 +- core/steps/microvm/create_test.go | 10 +- core/steps/microvm/delete.go | 10 +- core/steps/microvm/delete_test.go | 10 +- core/steps/microvm/start.go | 10 +- core/steps/microvm/start_test.go | 10 +- core/steps/network/interface_create.go | 12 +- core/steps/network/interface_create_test.go | 10 +- core/steps/network/interface_delete.go | 10 +- core/steps/network/interface_delete_test.go | 10 +- core/steps/network/matcher_test.go | 2 +- core/steps/network/testconst_test.go | 2 +- core/steps/runtime/dir_create.go | 4 +- core/steps/runtime/dir_create_test.go | 2 +- core/steps/runtime/dir_delete.go | 4 +- core/steps/runtime/dir_delete_test.go | 2 +- core/steps/runtime/initrd_mount.go | 10 +- core/steps/runtime/initrd_mount_test.go | 10 +- core/steps/runtime/kernel_mount.go | 10 +- core/steps/runtime/kernel_mount_test.go | 10 +- core/steps/runtime/repo_release.go | 10 +- core/steps/runtime/repo_release_test.go | 8 +- core/steps/runtime/volume_mount.go | 10 +- core/steps/runtime/volume_mount_test.go | 10 +- docs/adr/0003-grpc-validation.md | 15 +- docs/adr/0005-network-device-name.md | 16 +- docs/adr/0234-update-api.md | 16 +- docs/adr/0241-opinionated-api-changes.md | 41 ++-- docs/adr/0246-linters.md | 29 +-- docs/releasing.md | 26 +-- flintlockd.service | 2 +- go.mod | 14 +- go.sum | 1 + hack/scripts/README.md | 2 +- hack/scripts/provision.sh | 2 +- hack/tools/go.mod | 18 +- hack/tools/go.sum | 75 +++--- infrastructure/containerd/content.go | 4 +- infrastructure/containerd/convert.go | 4 +- infrastructure/containerd/event_service.go | 2 +- .../containerd/event_service_test.go | 6 +- infrastructure/containerd/image_service.go | 6 +- .../image_service_integration_test.go | 6 +- .../containerd/image_service_test.go | 8 +- infrastructure/containerd/repo.go | 8 +- infrastructure/containerd/repo_test.go | 6 +- .../controllers/microvm_controller.go | 13 +- .../controllers/microvm_controller_test.go | 14 +- infrastructure/godisk/disk_service.go | 2 +- infrastructure/godisk/disk_service_test.go | 3 +- infrastructure/grpc/convert.go | 10 +- infrastructure/grpc/server.go | 10 +- infrastructure/grpc/server_test.go | 10 +- .../microvm/cloudhypervisor/cloudinit.go | 8 +- .../microvm/cloudhypervisor/create.go | 10 +- .../microvm/cloudhypervisor/delete.go | 10 +- .../microvm/cloudhypervisor/metrics.go | 8 +- .../microvm/cloudhypervisor/provider.go | 16 +- .../microvm/cloudhypervisor/state.go | 4 +- infrastructure/microvm/firecracker/config.go | 29 ++- infrastructure/microvm/firecracker/create.go | 8 +- .../microvm/firecracker/provider.go | 12 +- infrastructure/microvm/firecracker/state.go | 6 +- .../microvm/firecracker/types_test.go | 2 +- infrastructure/microvm/providers.go | 12 +- infrastructure/microvm/shared/network.go | 6 +- infrastructure/microvm/shared/pid.go | 2 +- infrastructure/mock/containerd.go | 2 +- infrastructure/mock/gen.go | 4 +- infrastructure/mock/ports.go | 6 +- infrastructure/network/network_service.go | 8 +- infrastructure/network/utils.go | 2 +- infrastructure/network/utils_test.go | 4 +- infrastructure/ulid/ulid.go | 2 +- internal/command/flags/flags.go | 7 +- internal/command/flags/urfave.go | 4 +- internal/command/metrics/serve.go | 10 +- internal/command/root.go | 12 +- internal/command/run/run.go | 18 +- internal/config/config.go | 2 +- internal/config/validation_test.go | 2 +- internal/inject/wire.go | 22 +- internal/inject/wire_gen.go | 24 +- pkg/auth/basic_test.go | 2 +- pkg/auth/tls.go | 2 +- pkg/log/log_test.go | 2 +- pkg/planner/actuator.go | 2 +- pkg/planner/actuator_test.go | 6 +- pkg/planner/planner.go | 2 +- pkg/process/process_test.go | 2 +- pkg/queue/queue_test.go | 2 +- pkg/validation/validate.go | 2 +- pkg/validation/validate_test.go | 2 +- pkg/wait/wait_test.go | 2 +- test/e2e/e2e_test.go | 6 +- test/e2e/utils/runner.go | 4 +- test/e2e/utils/utils.go | 8 +- test/tools/config/config.py | 2 +- test/tools/config/userdata.sh | 6 +- test/tools/example-config.yaml | 10 +- userdocs/docs/getting-started/firecracker.md | 9 +- userdocs/docs/getting-started/flintlock.md | 4 +- userdocs/docs/getting-started/setup.md | 2 +- userdocs/docs/getting-started/usage.md | 16 +- userdocs/docs/guides/images.md | 62 ++--- userdocs/docs/intro.md | 7 +- userdocs/docusaurus.config.js | 20 +- userdocs/src/pages/flintlock-api.js | 2 +- 153 files changed, 960 insertions(+), 937 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2ecf6f85..3486b51f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,9 +1,9 @@ --- name: Bug report about: Tell us about a problem you are experiencing -title: '' +title: "" labels: kind/bug -assignees: '' +assignees: "" --- **What happened:** [A clear and concise description of what the bug is.] - **What did you expect to happen:** - **How to reproduce it:** - **Anything else you would like to add:** [Miscellaneous information that will assist in solving the issue.] - **Environment:** - flintlock version: diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index eb882b72..34fe6b8d 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,9 +1,9 @@ --- name: Feature enhancement request about: Suggest an idea for flintlock -title: '' +title: "" labels: kind/feature -assigness: '' +assigness: "" --- **Describe the solution you'd like:** diff --git a/.github/workflows/dependabot_bundler.yml b/.github/workflows/dependabot_bundler.yml index c8962bd6..9658e320 100644 --- a/.github/workflows/dependabot_bundler.yml +++ b/.github/workflows/dependabot_bundler.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version-file: '${{ github.workspace }}/go.mod' + go-version-file: "${{ github.workspace }}/go.mod" - name: Cache go-build and mod uses: actions/cache@v2 with: @@ -34,7 +34,7 @@ jobs: run: | dependabot-bundler \ --token ${{ secrets.GITHUB_TOKEN }} \ - --owner weaveworks-liquidmetal \ + --owner liquidmetal-dev \ --repo flintlock \ --labels 'area/dependency,kind/cleanup,user-signing-required' \ --pr-title 'chore(deps): Bundle dependabot pull requests' diff --git a/.github/workflows/deploy-docs.yaml b/.github/workflows/deploy-docs.yaml index 1d62ea27..764077b0 100644 --- a/.github/workflows/deploy-docs.yaml +++ b/.github/workflows/deploy-docs.yaml @@ -14,23 +14,23 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 with: - node-version: '16.x' + node-version: "16.x" - uses: actions/setup-go@v3 with: - go-version-file: '${{ github.workspace }}/go.mod' + go-version-file: "${{ github.workspace }}/go.mod" - name: Build docs run: make docs-build release: - if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'weaveworks-liquidmetal' }} + if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'liquidmetal-dev' }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 with: - node-version: '16.x' + node-version: "16.x" - uses: actions/setup-go@v3 with: - go-version-file: '${{ github.workspace }}/go.mod' + go-version-file: "${{ github.workspace }}/go.mod" - uses: webfactory/ssh-agent@v0.5.0 with: ssh-private-key: ${{ secrets.BOT_DEPLOY_KEY }} @@ -41,5 +41,5 @@ jobs: DEPLOYMENT_BRANCH: gh-pages run: | git config --global user.email "noreply@github.com" - git config --global user.name "weaveworks-docs-bot" + git config --global user.name "liquidmetal-docs-bot" make docs-deploy diff --git a/.github/workflows/fork.yaml b/.github/workflows/fork.yaml index 038a95a1..383835cb 100644 --- a/.github/workflows/fork.yaml +++ b/.github/workflows/fork.yaml @@ -3,7 +3,7 @@ name: bump firecracker on: workflow_dispatch: {} schedule: - - cron: 0 0 * * 1 + - cron: 0 0 * * 1 jobs: update: @@ -11,76 +11,76 @@ jobs: permissions: issues: write steps: - - name: Checkout - uses: actions/checkout@v2 - with: - ssh-key: ${{ secrets.WEAVEWORKSBOT_TOKEN }} - fetch-depth: 0 - - name: Bump firecracker? - run: | - new_version=$(./hack/scripts/bump_firecracker.sh) - if [[ "$new_version" == "" ]]; then - echo "No new Firecracker release. Nothing to do. (this is not an error, no worries.)" - fi + - name: Checkout + uses: actions/checkout@v2 + with: + ssh-key: ${{ secrets.LIQUIDMETALBOT_TOKEN }} + fetch-depth: 0 + - name: Bump firecracker? + run: | + new_version=$(./hack/scripts/bump_firecracker.sh) + if [[ "$new_version" == "" ]]; then + echo "No new Firecracker release. Nothing to do. (this is not an error, no worries.)" + fi - echo 'NEW_VERSION<> $GITHUB_ENV - echo "${new_version}" >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV - - name: Create Issue - if: ${{ env.NEW_VERSION != '' }} - uses: imjohnbo/issue-bot@v3 - id: issue - with: - title: 'Bump firecracker version to ${{ env.NEW_VERSION }}' - pinned: false - close-previous: true - assignees: "Callisto13, yitsushi, Skarlso" - rotate-assignees: true - body: |- - This is an automatically generated Issue to release a new version of - Firecracker on our fork. - There are some manual steps to get new releases of our fork - branch published. - This Issue is to track those manual steps. + echo 'NEW_VERSION<> $GITHUB_ENV + echo "${new_version}" >> $GITHUB_ENV + echo 'EOF' >> $GITHUB_ENV + - name: Create Issue + if: ${{ env.NEW_VERSION != '' }} + uses: imjohnbo/issue-bot@v3 + id: issue + with: + title: "Bump firecracker version to ${{ env.NEW_VERSION }}" + pinned: false + close-previous: true + assignees: "Callisto13, yitsushi, Skarlso" + rotate-assignees: true + body: |- + This is an automatically generated Issue to release a new version of + Firecracker on our fork. + There are some manual steps to get new releases of our fork + branch published. + This Issue is to track those manual steps. - **Note that for now we are mirroring firecracker's releases of v1.1.x, v1.2.x and v1.3.x versions**. + **Note that for now we are mirroring firecracker's releases of v1.1.x, v1.2.x and v1.3.x versions**. - To complete work on this Issue: - - [ ] Clone [our fork](https://github.com/weaveworks/firecracker) (if you do not have it already). - - [ ] Add the upstream as a remote: `git add remote up https://github.com/firecracker-microvm/firecracker` - - [ ] Fetch all branches and tags: `git fetch && git fetch --tags` - - [ ] Check out to the relevant `macvtap` version branch. `feature/macvtap` for a new `v1.2.x` release, `feature/macvtapv11x` for a new `v1.1.x` release. - - [ ] Update the feature branch. `git rebase firecracker-v1.3` for a `v1.3.x` release `git rebase firecracker-v1.2` for a `v1.2.x` release, etc. etc. - - [ ] Resolve any merge conflicts if necessary. (There will be merge conflicts.) - - [ ] Add any code if necessary. (This will gradually become more necessary, because the older this feature branch gets, the more the code around it upstream will change.) - - [ ] Make sure it builds. (`tools/devtool build`) - - [ ] Push the updated firecracker 'feature/macvtap' (or `firecracker/macvtapv12`, etc) fork branch. - - [ ] Create a new tag on the updated firecracker fork branch: `git tag -s ${{ env.NEW_VERSION}}-macvtap -m ${{ env.NEW_VERSION }}-macvtap`. - - [ ] Push the tag to the fork: `git push ${{ env.NEW_VERSION }}-macvtap` (A new [release](https://github.com/weaveworks/firecracker/releases) will be created.) - - [ ] In this repo, trigger the `nightly_e2e` workflow - - [ ] Once the tests have passed you can close the Issue, if the tests fail, either fix them or unrelease the version + To complete work on this Issue: + - [ ] Clone [our fork](https://github.com/liquidmetal-dev/firecracker) (if you do not have it already). + - [ ] Add the upstream as a remote: `git add remote up https://github.com/firecracker-microvm/firecracker` + - [ ] Fetch all branches and tags: `git fetch && git fetch --tags` + - [ ] Check out to the relevant `macvtap` version branch. `feature/macvtap` for a new `v1.2.x` release, `feature/macvtapv11x` for a new `v1.1.x` release. + - [ ] Update the feature branch. `git rebase firecracker-v1.3` for a `v1.3.x` release `git rebase firecracker-v1.2` for a `v1.2.x` release, etc. etc. + - [ ] Resolve any merge conflicts if necessary. (There will be merge conflicts.) + - [ ] Add any code if necessary. (This will gradually become more necessary, because the older this feature branch gets, the more the code around it upstream will change.) + - [ ] Make sure it builds. (`tools/devtool build`) + - [ ] Push the updated firecracker 'feature/macvtap' (or `firecracker/macvtapv12`, etc) fork branch. + - [ ] Create a new tag on the updated firecracker fork branch: `git tag -s ${{ env.NEW_VERSION}}-macvtap -m ${{ env.NEW_VERSION }}-macvtap`. + - [ ] Push the tag to the fork: `git push ${{ env.NEW_VERSION }}-macvtap` (A new [release](https://github.com/liquidmetal-dev/firecracker/releases) will be created.) + - [ ] In this repo, trigger the `nightly_e2e` workflow + - [ ] Once the tests have passed you can close the Issue, if the tests fail, either fix them or unrelease the version - Auto-generated by [issue-bot](https://github.com/imjohnbo/issue-bot). - labels: "area/firecracker, area/dependency, kind/feature, priority/critical-urgent" - - name: Notify slack on creation success - if: ${{ success() && env.NEW_VERSION != '' }} - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a - with: - slack_token: ${{ secrets.SLACK_TOKEN }} - message: "There is a new version of Firecracker, complete the todo list here: ." - channel: liquid-metal-dev - color: green - verbose: false + Auto-generated by [issue-bot](https://github.com/imjohnbo/issue-bot). + labels: "area/firecracker, area/dependency, kind/feature, priority/critical-urgent" + - name: Notify slack on creation success + if: ${{ success() && env.NEW_VERSION != '' }} + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + with: + slack_token: ${{ secrets.SLACK_TOKEN }} + message: "There is a new version of Firecracker, complete the todo list here: ." + channel: liquid-metal-dev + color: green + verbose: false notify: needs: [update] if: ${{ failure() }} runs-on: ubuntu-latest steps: - - name: Notify slack on failure - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a - with: - slack_token: ${{ secrets.SLACK_TOKEN }} - message: "There is a new firecracker version, but the 'Bump Firecracker' issue failed :sad-parrot: ." - channel: liquid-metal-dev - color: red - verbose: false + - name: Notify slack on failure + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + with: + slack_token: ${{ secrets.SLACK_TOKEN }} + message: "There is a new firecracker version, but the 'Bump Firecracker' issue failed :sad-parrot: ." + channel: liquid-metal-dev + color: red + verbose: false diff --git a/.github/workflows/nightly_e2e.yml b/.github/workflows/nightly_e2e.yml index bf6ae08c..54e29197 100644 --- a/.github/workflows/nightly_e2e.yml +++ b/.github/workflows/nightly_e2e.yml @@ -8,53 +8,53 @@ on: jobs: e2e: runs-on: ubuntu-latest - if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'weaveworks-liquidmetal' }} + if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'liquidmetal-dev' }} env: PROJECT_NAME: "flintlock_nightly_e2e" name: e2e tests steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: Get branch name - id: branch-name - uses: tj-actions/branch-names@v5 + - name: Get branch name + id: branch-name + uses: tj-actions/branch-names@v5 - - name: Run tests - env: - METAL_AUTH_TOKEN: ${{ secrets.METAL_AUTH_TOKEN }} - run: | - pip3 install -r test/tools/requirements.txt - cat <<'EOF' >> e2e-config.yaml - --- - org_id: ${{ secrets.EQUINIX_ORG_ID }} - project_name: ${{ env.PROJECT_NAME }} - repo: - branch: ${{ steps.branch-name.outputs.current_branch }} - EOF - test/tools/run.py run-e2e -c e2e-config.yaml + - name: Run tests + env: + METAL_AUTH_TOKEN: ${{ secrets.METAL_AUTH_TOKEN }} + run: | + pip3 install -r test/tools/requirements.txt + cat <<'EOF' >> e2e-config.yaml + --- + org_id: ${{ secrets.EQUINIX_ORG_ID }} + project_name: ${{ env.PROJECT_NAME }} + repo: + branch: ${{ steps.branch-name.outputs.current_branch }} + EOF + test/tools/run.py run-e2e -c e2e-config.yaml - - name: Notify slack on failure - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a - if: ${{ failure() }} - with: - slack_token: ${{ secrets.SLACK_TOKEN }} - message: "A flintlock integration test run failed :sad-parrot: and weep." - channel: liquid-metal-dev - color: red - verbose: false + - name: Notify slack on failure + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + if: ${{ failure() }} + with: + slack_token: ${{ secrets.SLACK_TOKEN }} + message: "A flintlock integration test run failed :sad-parrot: and weep." + channel: liquid-metal-dev + color: red + verbose: false - - name: Notify slack on success - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a - if: ${{ success() }} - with: - slack_token: ${{ secrets.SLACK_TOKEN }} - message: "A flintlock integration test run succeeded :party-gopher:" - channel: liquid-metal-dev - color: green - verbose: false + - name: Notify slack on success + uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a + if: ${{ success() }} + with: + slack_token: ${{ secrets.SLACK_TOKEN }} + message: "A flintlock integration test run succeeded :party-gopher:" + channel: liquid-metal-dev + color: green + verbose: false - - name: Cleanup project - uses: weaveworks/metal-janitor-action@27a0594c5c92d85585b553fc0c5ef2a3de7bec95 - with: - metal_auth_token: ${{ secrets.METAL_AUTH_TOKEN }} - project_names: ${{ env.PROJECT_NAME }} + - name: Cleanup project + uses: weaveworks/metal-janitor-action@27a0594c5c92d85585b553fc0c5ef2a3de7bec95 + with: + metal_auth_token: ${{ secrets.METAL_AUTH_TOKEN }} + project_names: ${{ env.PROJECT_NAME }} diff --git a/.golangci.yml b/.golangci.yml index 66a1bb00..f9d78eda 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,10 +1,10 @@ run: - go: "1.18" - timeout: 10m - tests: false - allow-parallel-runners: true - skip-dirs: - - "./*/mock" + go: "1.18" + timeout: 10m + tests: false + allow-parallel-runners: true + skip-dirs: + - "./*/mock" linters-settings: funlen: @@ -24,7 +24,7 @@ linters-settings: misspell: locale: GB goimports: - local-prefixes: github.com/weaveworks/flintlock + local-prefixes: github.com/liquidmetal-dev/flintlock govet: check-shadowing: true nolintlint: @@ -34,72 +34,72 @@ linters-settings: require-specific: false varnamelen: ignore-names: - - err - - wg - - fs - - id - - vm - - ns - - ip + - err + - wg + - fs + - id + - vm + - ns + - ip issues: max-same-issues: 0 max-issues-per-linter: 0 exclude-rules: - - text: "should not use dot imports|don't use an underscore in package name" - linters: - - golint - - text: "local replacement are not allowed: github.com/weaveworks/flintlock/" - linters: - - gomoddirectives - - text: "sig: func github.com/weaveworks/flintlock/" - linters: - - wrapcheck - - source: "https://" - linters: - - lll - - path: pkg/defaults/ - linters: - - lll - - path: _test\.go - linters: - - goerr113 - - gocyclo - - errcheck - - gosec - - dupl - - funlen - - scopelint - - testpackage - - path: internal/version/ - linters: - - gochecknoglobals - - path: internal/command/ - linters: - - exhaustivestruct - - lll - - wrapcheck - - source: "// .* #\\d+" - linters: - - godox - - path: test/e2e/ - linters: - - goerr113 - - gomnd - # remove this once https://github.com/golangci/golangci-lint/issues/2649 is closed - - path: / - linters: - - typecheck + - text: "should not use dot imports|don't use an underscore in package name" + linters: + - golint + - text: "local replacement are not allowed: github.com/liquidmetal-dev/flintlock/" + linters: + - gomoddirectives + - text: "sig: func github.com/liquidmetal-dev/flintlock/" + linters: + - wrapcheck + - source: "https://" + linters: + - lll + - path: pkg/defaults/ + linters: + - lll + - path: _test\.go + linters: + - goerr113 + - gocyclo + - errcheck + - gosec + - dupl + - funlen + - scopelint + - testpackage + - path: internal/version/ + linters: + - gochecknoglobals + - path: internal/command/ + linters: + - exhaustivestruct + - lll + - wrapcheck + - source: "// .* #\\d+" + linters: + - godox + - path: test/e2e/ + linters: + - goerr113 + - gomnd + # remove this once https://github.com/golangci/golangci-lint/issues/2649 is closed + - path: / + linters: + - typecheck linters: enable-all: true disable: - - exhaustivestruct - - golint - - interfacer - - ireturn - - maligned - - nilnil - - scopelint - - tagliatelle - - gomoddirectives + - exhaustivestruct + - golint + - interfacer + - ireturn + - maligned + - nilnil + - scopelint + - tagliatelle + - gomoddirectives diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 4fe0e712..460e5323 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,7 +1,6 @@ -## Community Code of Conduct +# Community Code of Conduct -Weaveworks follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). +Liquid Metal follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). Instances of abusive, harassing, or otherwise unacceptable behavior -may be reported by contacting a Weaveworks project maintainer, or -Alexis Richardson (alexis@weave.works). \ No newline at end of file +may be reported by contacting one of the maintainers. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5b27d64..eb21cb56 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,6 +29,7 @@ and run: mdtoc -inplace CONTRIBUTING.md --> + - [Where can I get involved?](#where-can-i-get-involved) - [Opening Issues](#opening-issues) - [Bug report guide](#bug-report-guide) @@ -66,26 +67,27 @@ Here is a non-exhaustive list of ways you can help out: 1. Open a [PR](#submitting-prs). :woman_technologist: - Beyond fixing bugs and submitting new features, there are other things you can submit - which, while less flashy, will be deeply appreciated by all who interact with the codebase: + Beyond fixing bugs and submitting new features, there are other things you can submit + which, while less flashy, will be deeply appreciated by all who interact with the codebase: - - Backfilling tests! - - Refactoring! - - Reviewing and updating [documentation][user-docs]! + - Backfilling tests! + - Refactoring! + - Reviewing and updating [documentation][user-docs]! (See also [Choosing something to work on](#choosing-something-to-work-on) below.) + 1. Open an [issue](#opening-issues). :interrobang: - We have 3 forms of issue: [bug reports](#bug-report-guide), [feature requests](#feature-request-guide) and [help requests](#help-request-guide). - If you are not sure which category you need, just make the best guess and provide as much information as possible. + We have 3 forms of issue: [bug reports](#bug-report-guide), [feature requests](#feature-request-guide) and [help requests](#help-request-guide). + If you are not sure which category you need, just make the best guess and provide as much information as possible. 1. Help out others in the [community slack channel][slack-channel], or in some [discussions][discussions]. :sos: -1. Chime in on [bugs](https://github.com/weaveworks-liquidmetal/flintlock/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug+), [feature requests](https://github.com/weaveworks-liquidmetal/flintlock/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Ffeature) and asks for [help][discussions]. :thought_balloon: +1. Chime in on [bugs](https://github.com/liquidmetal-dev/flintlock/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug+), [feature requests](https://github.com/liquidmetal-dev/flintlock/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Ffeature) and asks for [help][discussions]. :thought_balloon: -1. Dig into some [`needs-investigation`](https://github.com/weaveworks-liquidmetal/flintlock/labels/needs-investigation) or [`help wanted`](https://github.com/weaveworks-liquidmetal/flintlock/labels/help-wanted) :detective: +1. Dig into some [`needs-investigation`](https://github.com/liquidmetal-dev/flintlock/labels/needs-investigation) or [`help wanted`](https://github.com/liquidmetal-dev/flintlock/labels/help-wanted) :detective: -1. Get involved in some [PR reviews](https://github.com/weaveworks-liquidmetal/flintlock/pulls). :nerd_face: +1. Get involved in some [PR reviews](https://github.com/liquidmetal-dev/flintlock/pulls). :nerd_face: # Opening Issues @@ -99,24 +101,25 @@ _See below for [how issues are prioritized](#prioritizing-issues)_. 1. Before opening anything, take a good look through existing issues. 1. More is more: give as much information as it is humanly possible to give. - Highly detailed issues are more likely to be picked up because they can be prioritized and - scheduled for work faster. They are also more accessible - to the community, meaning that you may not have to wait for the core team to get to it. + Highly detailed issues are more likely to be picked up because they can be prioritized and + scheduled for work faster. They are also more accessible + to the community, meaning that you may not have to wait for the core team to get to it. 1. Please do not open an issue with a description that is **just** a link to another issue, - a link to a slack conversation, a quote from either one of those, or anything else - equally opaque. This raises the bar for entry and makes it hard for the community - to get involved. Take the time to write a proper description and summarise key points. + a link to a slack conversation, a quote from either one of those, or anything else + equally opaque. This raises the bar for entry and makes it hard for the community + to get involved. Take the time to write a proper description and summarise key points. 1. Take care with formatting. Ensure the [markdown is tidy](https://docs.github.com/en/free-pro-team@latest/github/writing-on-github/getting-started-with-writing-and-formatting-on-github), - use [code blocks](https://docs.github.com/en/free-pro-team@latest/github/writing-on-github/creating-and-highlighting-code-blocks) etc etc. - The faster something can be read, the faster it can be dealt with. + use [code blocks](https://docs.github.com/en/free-pro-team@latest/github/writing-on-github/creating-and-highlighting-code-blocks) etc etc. + The faster something can be read, the faster it can be dealt with. 1. Keep it civil. Yes, it is annoying when things don't work, but it is way more fun helping out - someone who is not... the worst. Remember that conversing via text exacerbates - everyone's negativity bias, so throw in some emoji when in doubt :+1: :smiley: :rocket: :tada:. + someone who is not... the worst. Remember that conversing via text exacerbates + everyone's negativity bias, so throw in some emoji when in doubt :+1: :smiley: :rocket: :tada:. **Dedicated guides**: + - [Bug report guide](#bug-report-guide) - [Feature request guide](#feature-request-guide) - [Help request guide](#help-request-guide) @@ -135,30 +138,30 @@ information. Add more that what is asked for if you can :smiley:. 1. **Bump to the latest version of flintlock** to see whether your issue has already been fixed. 1. **Write a concise and descriptive title**, like you would a commit message, something which others can easily - find when doing step 1 above. + find when doing step 1 above. 1. **Detail what it was that you were trying to do and what you expected would happen**. - Give some background information around what you have already done to your environment, any custom configuration etc. - With sufficient information you can pre-empt any questions others may have. This should cut out some obvious - back-and-forth and help get people to the heart of the issue quickly. + Give some background information around what you have already done to your environment, any custom configuration etc. + With sufficient information you can pre-empt any questions others may have. This should cut out some obvious + back-and-forth and help get people to the heart of the issue quickly. 1. **Explain what actually happened**. Provide the relevant error message and key logs. 1. **Provide a reproduction**, for example the exact command you started `flintlockd` with, - or a config file, and anything important in the environment where `flintlockd` is running. - Please try to reduce your reproduction to the minimal necessary to help whoever is helping you - get to the broken state without needing to recreate your entire environment. + or a config file, and anything important in the environment where `flintlockd` is running. + Please try to reduce your reproduction to the minimal necessary to help whoever is helping you + get to the broken state without needing to recreate your entire environment. 1. **If possible, reproduce the issue with logging verbosity set to 9** (`--verbosity 9`), if you have not already done so. Ensure - logs are formatted with [code blocks](https://docs.github.com/en/free-pro-team@latest/github/writing-on-github/creating-and-highlighting-code-blocks). - If they are long (>50 lines) please provide them in a Gist or collapsed using - [HTML details tags](https://gist.github.com/ericclemmons/b146fe5da72ca1f706b2ef72a20ac39d). - Take care to redact any sensitive info. + logs are formatted with [code blocks](https://docs.github.com/en/free-pro-team@latest/github/writing-on-github/creating-and-highlighting-code-blocks). + If they are long (>50 lines) please provide them in a Gist or collapsed using + [HTML details tags](https://gist.github.com/ericclemmons/b146fe5da72ca1f706b2ef72a20ac39d). + Take care to redact any sensitive info. 1. Detail any workarounds which you tried, it may help others who experience the same problem. 1. If you already have a fix in mind, note that on the report and go ahead and open a - PR whenever you are ready. A core team-member will assign the issue to you. + PR whenever you are ready. A core team-member will assign the issue to you. ## Feature request guide @@ -176,16 +179,16 @@ Below are the steps we encourage people to take when creating a new feature requ 1. **Explain clearly why you want this feature.** 1. **Describe the behaviour you'd like to see.** As well as an explanation, please - provide some example commands/config/output. Please ensure everything is formatted - nicely with [code blocks](https://docs.github.com/en/free-pro-team@latest/github/writing-on-github/creating-and-highlighting-code-blocks). - If you have strong ideas, be as detailed as you like. + provide some example commands/config/output. Please ensure everything is formatted + nicely with [code blocks](https://docs.github.com/en/free-pro-team@latest/github/writing-on-github/creating-and-highlighting-code-blocks). + If you have strong ideas, be as detailed as you like. 1. Note the deliverable of this issue: should the outcome be a simple PR to implement the - feature? Or does it need further design or an [ADR](#adrs-architectural-decision-records)? + feature? Or does it need further design or an [ADR](#adrs-architectural-decision-records)? 1. If the feature is small (maybe it is more of an improvement) and you already have - a solution in mind, explain what you plan to do on the issue and open a PR! - A core team member will assign the task to you. + a solution in mind, explain what you plan to do on the issue and open a PR! + A core team member will assign the task to you. ## Help request guide @@ -214,13 +217,14 @@ Please following these steps when starting a new discussion: It may turn out that it was a bug after all! In which case a new issue will be created. # Submitting PRs + ## Choosing something to work on If you are not here to report a bug, ask for help or request some new behaviour, this is the section for you. We have curated a set of issues for anyone who simply wants to build up their open-source cred :muscle:. -- Issues labelled [`good first issue`](https://github.com/weaveworks-liquidmetal/flintlock/labels/good%20first%20issue) +- Issues labelled [`good first issue`](https://github.com/liquidmetal-dev/flintlock/labels/good%20first%20issue) should be accessible to folks new to the repo, as well as to open source in general. These issues should present a low/non-existent barrier to entry with a thorough description, @@ -236,7 +240,7 @@ wants to build up their open-source cred :muscle:. See more on [asking for help](#asking-for-help) below! -- [`help wanted` issues](https://github.com/weaveworks-liquidmetal/flintlock/labels/help%20wanted) +- [`help wanted` issues](https://github.com/liquidmetal-dev/flintlock/labels/help%20wanted) are for those a little more familiar with the code base, but should still be accessible enough to newcomers. @@ -246,6 +250,7 @@ wants to build up their open-source cred :muscle:. ## Developing flintlock **Sections:** + - [Forking the repo](#forking-the-repo) - [Setting up your environment](#setting-up-your-environment) - [Building flintlock](#building-flintlock) @@ -283,7 +288,7 @@ highlights some tools you can use to interact with the service. This project is written in Go. To be able to contribute you will need: 1. A working Go installation of go 1.18. You can check the -[official installation guide](https://golang.org/doc/install). + [official installation guide](https://golang.org/doc/install). 2. Make sure that `$(go env GOPATH)/bin` is in your shell's `PATH`. You can do so by running `export PATH="$(go env GOPATH)/bin:$PATH"` @@ -306,7 +311,7 @@ docker run --rm -it \ --volume $(pwd):/src/flintlock \ --ipc=host \ --workdir=/src/flintlock \ - weaveworks/flintlock-e2e:latest \ + liquidmetal-dev/flintlock-e2e:latest \ /bin/bash ``` @@ -325,6 +330,7 @@ The tests at `infrastructure/containerd` require containerd to be running, but these are disabled unless `CTR_SOCK_PATH` is set on the environment. To enable these tests: + ```bash # start containerd export CTR_SOCK_PATH= @@ -340,39 +346,39 @@ See the dedicated docs for the end to end tests [here](test/e2e/README.md). Once you have your environment set up and have completed a clean run of **both** the unit and the E2E tests you can get to work :tada: . -1. First create a topic branch from where you want to base your work (this is usually - from `main`): +1. First create a topic branch from where you want to base your work (this is usually + from `main`): - ```bash - git checkout -b - ``` + ```bash + git checkout -b + ``` -1. Write your solution. Try to align with existing patterns and standards. +1. Write your solution. Try to align with existing patterns and standards. -1. Try to commit in small chunks so that changes are well described - and not lumped in with something unrelated. This will make debugging easier in - the future. - Make sure commit messages are in the [proper format](#commit-message-formatting). +1. Try to commit in small chunks so that changes are well described + and not lumped in with something unrelated. This will make debugging easier in + the future. + Make sure commit messages are in the [proper format](#commit-message-formatting). -1. Ensure that every commit is **compilable** and that the tests run successfully at - that point. +1. Ensure that every commit is **compilable** and that the tests run successfully at + that point. -1. Make sure your commits are [signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits). +1. Make sure your commits are [signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits). -1. **All code contributions must be submitted with unit tests**. Read [this ADR](https://github.com/weaveworks-liquidmetal/flintlock/discussions/284) - for our guide on what counts as appropriate testing. - See [this package](https://github.com/weaveworks-liquidmetal/flintlock/tree/main/core/steps/microvm) package for a good example of tests. +1. **All code contributions must be submitted with unit tests**. Read [this ADR](https://github.com/liquidmetal-dev/flintlock/discussions/284) + for our guide on what counts as appropriate testing. + See [this package](https://github.com/liquidmetal-dev/flintlock/tree/main/core/steps/microvm) package for a good example of tests. -1. For extra special bonus points, if you see any tests missing from the area you are - working on, please add them! It will be much appreciated :heart: . +1. For extra special bonus points, if you see any tests missing from the area you are + working on, please add them! It will be much appreciated :heart: . -1. Check the documentation and update it to cover your changes, - either in the [README](README.md), [userdocs](userdocs) or [docs](docs/) folder. - If you have added a completely new feature please ensure that it is documented - thoroughly. +1. Check the documentation and update it to cover your changes, + either in the [README](README.md), [userdocs](userdocs) or [docs](docs/) folder. + If you have added a completely new feature please ensure that it is documented + thoroughly. -1. Before you [open your PR](#pr-submission-guidelines), run all the unit and E2E tests and manually - verify that your solution works. +1. Before you [open your PR](#pr-submission-guidelines), run all the unit and E2E tests and manually + verify that your solution works. ## Asking for help @@ -421,38 +427,38 @@ PRs which adhere to our guidelines are more likely to be accepted (when opening the PR, please use the checklist in the template): 1. **The description is thorough.** When writing your description, please be as detailed as possible: don't make people - guess what you did or simply link back to the issue (the issue explains the problem - you are trying to solve, not how you solved it.) - Guide your reviewers through your solution by highlighting - key changes and implementation choices. Try and pre-empt any obvious questions - they may have. Providing snippets (or screenshots) of output is very helpful to - demonstrate new behaviour or UX changes. (Snippets are more searchable than screenshots, - but we wont be mad at a sneak peek at your terminal envs :eyes: .) + guess what you did or simply link back to the issue (the issue explains the problem + you are trying to solve, not how you solved it.) + Guide your reviewers through your solution by highlighting + key changes and implementation choices. Try and pre-empt any obvious questions + they may have. Providing snippets (or screenshots) of output is very helpful to + demonstrate new behaviour or UX changes. (Snippets are more searchable than screenshots, + but we wont be mad at a sneak peek at your terminal envs :eyes: .) 1. **The change has been manually tested.** If you are supplying output above - then that can be your manual test, with proof :clap: . + then that can be your manual test, with proof :clap: . 1. **The PR has a snappy title**. Your PR title will end up in the release notes, - so make it a good one. Using the same rule as for the title of a [commit message](#commit-message-formatting) - is generally a good idea. Try to use the [imperative](https://en.wikipedia.org/wiki/Imperative_mood) and centre it around the behaviour - or the user value it delivers, rather than any implementation detail. + so make it a good one. Using the same rule as for the title of a [commit message](#commit-message-formatting) + is generally a good idea. Try to use the [imperative](https://en.wikipedia.org/wiki/Imperative_mood) and centre it around the behaviour + or the user value it delivers, rather than any implementation detail. - eg: `"changed SomeFunc in file.go to also do thing X"` - is not useful for folks stopping by to quickly see what new stuff they can do with - `flintlock`, save that for commit messages or the PR description. - The title `"(feat): Add support for XYZ"` conveys the intent concisely and clearly. + eg: `"changed SomeFunc in file.go to also do thing X"` + is not useful for folks stopping by to quickly see what new stuff they can do with + `flintlock`, save that for commit messages or the PR description. + The title `"(feat): Add support for XYZ"` conveys the intent concisely and clearly. 1. **There are new tests for new code.** This is very much required. 1. **There are new tests for old code!** This will earn you the title of "Best Loved - and Respected Contributor" :boom: :sunglasses: . + and Respected Contributor" :boom: :sunglasses: . 1. **There are well-written commit messages** ([see below](#commit-message-formatting)) - which will make future debugging fun. (Any commits of the variety `"fix stuff"`, `"does thing"` - or `"my god why"` much be squashed or rebased.) + which will make future debugging fun. (Any commits of the variety `"fix stuff"`, `"does thing"` + or `"my god why"` much be squashed or rebased.) 1. **Each of those well-written commits is compilable** and the tests run successfully at - that point. + that point. In general, we will merge a PR once a maintainer has reviewed and approved it. Trivial changes (e.g., corrections to spelling) may get waved through. @@ -472,7 +478,7 @@ the body of the commit should describe the _why_ and _how_. If you encountered any weirdness along the way, this is a good place to note what you discovered and how you solved it. -An example of a stellar commit message can be found [here](https://github.com/weaveworks-liquidmetal/flintlock/commit/7a30dd99dc7c05827ba11050505c476799bb2932). +An example of a stellar commit message can be found [here](https://github.com/liquidmetal-dev/flintlock/commit/7a30dd99dc7c05827ba11050505c476799bb2932). The format can be described more formally as follows: @@ -499,7 +505,7 @@ The core team regularly processes incoming issues. There may be some delay over Every issue will be assigned a `priority/` label. The levels of priorities are: -- [`critical-urgent`](https://github.com/weaveworks-liquidmetal/flintlock/labels/priority%2Fcritical-urgent): These are time sensitive issues which should be picked up immediately. +- [`critical-urgent`](https://github.com/liquidmetal-dev/flintlock/labels/priority%2Fcritical-urgent): These are time sensitive issues which should be picked up immediately. If an issue labelled `critical` is not assigned or being actively worked on, someone is expected to drop what they're doing immediately to work on it. This usually means the core team, but community members are welcome to claim @@ -508,13 +514,13 @@ Every issue will be assigned a `priority/` label. The levels of priorities ar they will be paired with a core team-member to manage the tracking, communication and release of any fix as well as to assume responsibility of all progess._ -- [`important-soon`](https://github.com/weaveworks-liquidmetal/flintlock/labels/priority%2Fimportant-soon): Must be assigned as soon as capacity becomes available. +- [`important-soon`](https://github.com/liquidmetal-dev/flintlock/labels/priority%2Fimportant-soon): Must be assigned as soon as capacity becomes available. Ideally something should be delivered in time for the next release. -- [`important-longterm`](https://github.com/weaveworks-liquidmetal/flintlock/labels/priority%2Fimportant-longterm): Important over the long term, but may not be currently +- [`important-longterm`](https://github.com/liquidmetal-dev/flintlock/labels/priority%2Fimportant-longterm): Important over the long term, but may not be currently staffed and/or may require multiple releases to complete. -- [`backlog`](https://github.com/weaveworks-liquidmetal/flintlock/labels/priority%2Fbacklog): There appears to be general agreement that this would be good to have, +- [`backlog`](https://github.com/liquidmetal-dev/flintlock/labels/priority%2Fbacklog): There appears to be general agreement that this would be good to have, but we may not have anyone available to work on it right now or in the immediate future. PRs are still very welcome, although it might take a while to get them reviewed if reviewers are fully occupied with higher priority issues, for example immediately before a release. @@ -523,11 +529,11 @@ These priority categories have been inspired by [the Kubernetes contributing gui Other labels include: -- [`adr-required`](https://github.com/weaveworks-liquidmetal/flintlock/labels/adr-required): +- [`adr-required`](https://github.com/liquidmetal-dev/flintlock/labels/adr-required): Indicates that the issue or PR contains a decision that needs to be documented in a [ADR](#adrs-architectural-decision-records) _before_ it can be worked on. -- [`needs-investigation`](https://github.com/weaveworks-liquidmetal/flintlock/labels/needs-investigation): There is currently insufficient information to either categorize properly, +- [`needs-investigation`](https://github.com/liquidmetal-dev/flintlock/labels/needs-investigation): There is currently insufficient information to either categorize properly, or to understand and implement a solution. This could be because the issue opener did not provide enough relevant information, or because more in-depth research is required before work can begin. @@ -550,9 +556,9 @@ pull request. This PR is not signed and has the label `user-signing-required`. T done by a maintainer of the repository. Check out the PR and push an amending commit into the existing branch. Then, the PR can be merged. -For an example, take a look at this pull request: [Bundle dependabot pull requests](https://github.com/weaveworks-liquidmetal/flintlock/pull/655). +For an example, take a look at this pull request: [Bundle dependabot pull requests](https://github.com/liquidmetal-dev/flintlock/pull/655). -It was created by [this](https://github.com/weaveworks-liquidmetal/flintlock/actions/runs/4335326798) action triggered on the main branch. +It was created by [this](https://github.com/liquidmetal-dev/flintlock/actions/runs/4335326798) action triggered on the main branch. Once the pull request was opened, a maintainer created a commit into it by checking out the branch, then running a `git commit --amend`. @@ -583,25 +589,25 @@ Contributors are also welcome to backfill ADRs if they are found to be missing. 1. Choose an appropriate clear and concise title (eg `Implement flintlock in Go`). 1. Open the discussion providing the context of the decision to be made. Describe - the various options, if more than one, and explain the pros and cons. Highlight - any areas which you would like the reviewers to pay attention to, or those on which - you would specifically like an opinion. + the various options, if more than one, and explain the pros and cons. Highlight + any areas which you would like the reviewers to pay attention to, or those on which + you would specifically like an opinion. 1. Tag in the [maintainers](MAINTAINERS) as the "Deciders", and invite them to - participate and weigh in on the decision and its consequences. + participate and weigh in on the decision and its consequences. 1. Once a decision has been made, open a PR adding a new ADR to the [directory](docs/adr). - Copy and complete the [template][adr-template]; - - Increment the file number by one - - Set the status as "Accepted" - - Set the deciders as those who approved the discussion outcome - - Summarise the decision and consequences from the discussion thread - - Link back to the discussion from the ADR doc + Copy and complete the [template][adr-template]; + - Increment the file number by one + - Set the status as "Accepted" + - Set the deciders as those who approved the discussion outcome + - Summarise the decision and consequences from the discussion thread + - Link back to the discussion from the ADR doc # :rocket: :tada: Thanks for reading! :tada: :rocket: -[user-docs]: https://weaveworks-liquidmetal.github.io/flintlock/ +[user-docs]: https://www.liquidmetal.dev/flintlock/ [slack-channel]: https://weave-community.slack.com/archives/C02KARWGR7S [quick-start]: ./docs/quick-start.md -[discussions]: https://github.com/weaveworks-liquidmetal/flintlock/discussions +[discussions]: https://github.com/liquidmetal-dev/flintlock/discussions [adr-template]: ./docs/adr/0000-template.md diff --git a/Makefile b/Makefile index 98552b9a..a0fc3738 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BUILD_DATE := $(shell date +%Y-%m-%dT%H:%M:%SZ) GIT_COMMIT := $(shell git rev-parse --short HEAD) VERSION := $(shell git describe --tags --abbrev=0) -VERSION_PKG := github.com/weaveworks-liquidmetal/flintlock/internal/version +VERSION_PKG := github.com/liquidmetal-dev/flintlock/internal/version OS := $(shell go env GOOS) ARCH := $(shell go env GOARCH) UNAME := $(shell uname -s) @@ -48,7 +48,7 @@ PROTO_GEN_GRPC_OAPI := $(TOOLS_BIN_DIR)/protoc-gen-openapiv2 WIRE := $(TOOLS_BIN_DIR)/wire # Useful things -test_image = weaveworks/flintlock-e2e +test_image = liquidmetal-dev/flintlock-e2e .DEFAULT_GOAL := help @@ -81,15 +81,15 @@ build-release-flintlock-metrics: $(BIN_DIR) ## Build flintlock-metrics release b ##@ Generate .PHONY: generate -generate: $(BUF) $(MOCKGEN) +generate: $(BUF) $(MOCKGEN) $(WIRE) generate: ## Generate code $(MAKE) generate-go $(MAKE) generate-proto $(MAKE) generate-di .PHONY: generate-go -generate-go: $(MOCKGEN) ## Generate Go Code - go generate ./... -mod=mod +generate-go: $(MOCKGEN) ## Generate Go Code + go generate ./infrastructure/mock .PHONY: generate-proto ## Generate protobuf/grpc code generate-proto: $(BUF) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_GRPC) $(PROTO_GEN_GRPC_GW) $(PROTO_GEN_GRPC_OAPI) $(PROTOC_GEN_DOC) @@ -98,7 +98,7 @@ generate-proto: $(BUF) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_GRPC) $(PROTO_GEN_GRPC_G .PHONY: generate-di ## Generate the dependency injection code generate-di: $(WIRE) - $(WIRE) gen github.com/weaveworks-liquidmetal/flintlock/internal/inject + $(WIRE) gen github.com/liquidmetal-dev/flintlock/internal/inject ##@ Linting @@ -156,7 +156,7 @@ docker-build: ## Build the e2e docker image docker build -t $(test_image):latest -f test/docker/Dockerfile.e2e . .PHONY: docker-push -docker-push: docker-build ## Push the e2e docker image to weaveworks/fl-e2e +docker-push: docker-build ## Push the e2e docker image to liquidmetal-dev/fl-e2e docker push $(test_image):latest ##@ Tools binaries diff --git a/README.md b/README.md index 1260748d..d3feed03 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,16 @@ - # Flintlock - Create and manage the lifecycle of MicroVMs, backed by containerd. -[![GitHub](https://img.shields.io/github/license/weaveworks/flintlock)](https://img.shields.io/github/license/weaveworks/flintlock) -[![codecov](https://codecov.io/gh/weaveworks/flintlock/branch/main/graph/badge.svg?token=ZNPNRDI8Z0)](https://codecov.io/gh/weaveworks/flintlock) -[![Go Report Card](https://goreportcard.com/badge/github.com/weaveworks-liquidmetal/flintlock)](https://goreportcard.com/report/github.com/weaveworks-liquidmetal/flintlock) +[![GitHub](https://img.shields.io/github/license/liquidmetal-dev/flintlock)](https://img.shields.io/github/license/liquidmetal-dev/flintlock) +[![codecov](https://codecov.io/gh/liquidmetal-dev/flintlock/branch/main/graph/badge.svg?token=ZNPNRDI8Z0)](https://codecov.io/gh/liquidmetal-dev/flintlock) +[![Go Report Card](https://goreportcard.com/badge/github.com/liquidmetal-dev/flintlock)](https://goreportcard.com/report/github.com/liquidmetal-dev/flintlock) ## What is flintlock? > :tada: **This project was originally developed by Weaveworks but is now owned & run by the community. If you are interested in helping out please reach out.** - Flintlock is a service for creating and managing the lifecycle of microVMs on a host machine. We support [Firecracker](https://firecracker-microvm.github.io/) and [Cloud Hypervisor](https://www.cloudhypervisor.org/) (experimental). -The original use case for flintlock was to create microVMs on a bare-metal host where the microVMs will be used as nodes in a virtualized Kubernetes cluster. It is an essential part of [Liquid Metal](https://www.weave.works/blog/multi-cluster-kubernetes-on-microvms-for-bare-metal) and can be orchestrated by [Cluster API Provider Microvm](https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm). +The original use case for flintlock was to create microVMs on a bare-metal host where the microVMs will be used as nodes in a virtualized Kubernetes cluster. It is an essential part of [Liquid Metal](https://www.weave.works/blog/multi-cluster-kubernetes-on-microvms-for-bare-metal) and can be orchestrated by [Cluster API Provider Microvm](https://github.com/liquidmetal-dev/cluster-api-provider-microvm). However, its useful for many other use cases where lightweight virtualization is required (e.g. isolated workloads, pipelines). @@ -33,7 +31,7 @@ See our [getting started with flintlock][quickstart] tutorial. ## Contributing -Contributions are welcome. Please read the [CONTRIBUTING.md][contrib] and our [Code Of Conduct][coc]. +Contributions are welcome. Please read the [CONTRIBUTING.md][contrib] and our [Code Of Conduct][coc]. You can reach out to the maintainers and other contributors using the [#liquid-metal](https://weave-community.slack.com/archives/C02KARWGR7S) slack channel. @@ -58,13 +56,13 @@ The table below shows you which versions of Firecracker are compatible with Flin | Flintlock | Firecracker | Cloud Hypervisor | | ----------------- | -------------------------------- | ----------------- | -| v0.5.0 | Official v1.0+ or v1.0.0-macvtap | v26.0 | -| v0.4.0 | Official v1.0+ or v1.0.0-macvtap | **Not Supported** | -| v0.3.0 | Official v1.0+ or v1.0.0-macvtap | **Not Supported** | +| v0.5.0 | Official v1.0+ or v1.0.0-macvtap | v26.0 | +| v0.4.0 | Official v1.0+ or v1.0.0-macvtap | **Not Supported** | +| v0.3.0 | Official v1.0+ or v1.0.0-macvtap | **Not Supported** | | <= v0.2.0 | <= v0.25.2-macvtap | **Not Supported** | | <= v0.1.0-alpha.6 | <= v0.25.2-macvtap | **Not Supported** | -| v0.1.0-alpha.7 | **Do not use** | **Not Supported** | -| v0.1.0-alpha.8 | <= v0.25.2-macvtap | **Not Supported** | +| v0.1.0-alpha.7 | **Do not use** | **Not Supported** | +| v0.1.0-alpha.8 | <= v0.25.2-macvtap | **Not Supported** | > Note: Flintlock currently requires a custom build of Firecracker if you plan to use `macvtap` available [here][fc-fork]. @@ -72,11 +70,11 @@ The table below shows you which versions of Firecracker are compatible with Flin [MPL-2.0 License][license] -[quickstart]: https://weaveworks-liquidmetal.github.io/flintlock/docs/category/getting-started/ +[quickstart]: https://www.liquidmetal.dev [contrib]: ./CONTRIBUTING.md [coc]: ./CODE_OF_CONDUCT.md -[issues]: https://github.com/weaveworks-liquidmetal/flintlock/issues -[milestones]: https://github.com/weaveworks-liquidmetal/flintlock/milestones +[issues]: https://github.com/liquidmetal-dev/flintlock/issues +[milestones]: https://github.com/liquidmetal-dev/flintlock/milestones [adr]: ./docs/adr [license]: ./LICENSE -[fc-fork]: https://github.com/weaveworks/firecracker/releases +[fc-fork]: https://github.com/liquidmetal-dev/firecracker/releases diff --git a/api/go.mod b/api/go.mod index 891d308f..0a0f8508 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks-liquidmetal/flintlock/api +module github.com/liquidmetal-dev/flintlock/api go 1.17 diff --git a/api/services/microvm/v1alpha1/microvms.pb.go b/api/services/microvm/v1alpha1/microvms.pb.go index 1e552d0f..a1a04f46 100644 --- a/api/services/microvm/v1alpha1/microvms.pb.go +++ b/api/services/microvm/v1alpha1/microvms.pb.go @@ -8,7 +8,7 @@ package v1alpha1 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - types "github.com/weaveworks-liquidmetal/flintlock/api/types" + types "github.com/liquidmetal-dev/flintlock/api/types" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -528,22 +528,21 @@ var file_services_microvm_v1alpha1_microvms_proto_rawDesc = []byte{ 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x76, 0x6d, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x30, - 0x01, 0x42, 0xe6, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2d, 0x6c, 0x69, 0x71, 0x75, - 0x69, 0x64, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x2f, 0x66, 0x6c, 0x69, 0x6e, 0x74, 0x6c, 0x6f, 0x63, - 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x6d, - 0x69, 0x63, 0x72, 0x6f, 0x76, 0x6d, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x92, - 0x41, 0x97, 0x01, 0x12, 0x71, 0x0a, 0x15, 0x46, 0x6c, 0x69, 0x6e, 0x74, 0x6c, 0x6f, 0x63, 0x6b, - 0x20, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x56, 0x4d, 0x20, 0x41, 0x50, 0x49, 0x12, 0x53, 0x54, 0x68, - 0x65, 0x20, 0x46, 0x6c, 0x69, 0x6e, 0x74, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x4d, 0x69, 0x63, 0x72, - 0x6f, 0x56, 0x4d, 0x20, 0x41, 0x50, 0x49, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x20, - 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, - 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, - 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x76, 0x6d, - 0x73, 0x32, 0x03, 0x30, 0x2e, 0x31, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x01, 0x42, 0xdf, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x6c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x2d, 0x64, 0x65, 0x76, + 0x2f, 0x66, 0x6c, 0x69, 0x6e, 0x74, 0x6c, 0x6f, 0x63, 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x76, 0x6d, 0x2f, + 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x92, 0x41, 0x97, 0x01, 0x12, 0x71, 0x0a, 0x15, + 0x46, 0x6c, 0x69, 0x6e, 0x74, 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x56, + 0x4d, 0x20, 0x41, 0x50, 0x49, 0x12, 0x53, 0x54, 0x68, 0x65, 0x20, 0x46, 0x6c, 0x69, 0x6e, 0x74, + 0x6c, 0x6f, 0x63, 0x6b, 0x20, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x56, 0x4d, 0x20, 0x41, 0x50, 0x49, + 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x20, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, + 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x69, 0x6e, + 0x67, 0x20, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x76, 0x6d, 0x73, 0x32, 0x03, 0x30, 0x2e, 0x31, 0x32, + 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, + 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, + 0x73, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/services/microvm/v1alpha1/microvms.proto b/api/services/microvm/v1alpha1/microvms.proto index 40837216..a9379f74 100644 --- a/api/services/microvm/v1alpha1/microvms.proto +++ b/api/services/microvm/v1alpha1/microvms.proto @@ -9,7 +9,7 @@ import "google/api/annotations.proto"; import "protoc-gen-openapiv2/options/annotations.proto"; import "types/microvm.proto"; -option go_package = "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1"; +option go_package = "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { diff --git a/api/types/microvm.pb.go b/api/types/microvm.pb.go index 21b117c1..50662c56 100644 --- a/api/types/microvm.pb.go +++ b/api/types/microvm.pb.go @@ -1441,11 +1441,11 @@ var file_types_microvm_proto_rawDesc = []byte{ 0x64, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x0b, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0a, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x62, 0x72, - 0x69, 0x64, 0x67, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x3d, 0x5a, 0x3b, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x77, 0x6f, 0x72, - 0x6b, 0x73, 0x2d, 0x6c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x2f, 0x66, - 0x6c, 0x69, 0x6e, 0x74, 0x6c, 0x6f, 0x63, 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x64, 0x67, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x6d, 0x65, + 0x74, 0x61, 0x6c, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x66, 0x6c, 0x69, 0x6e, 0x74, 0x6c, 0x6f, 0x63, + 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/types/microvm.proto b/api/types/microvm.proto index 2068806a..ab13ec4d 100644 --- a/api/types/microvm.proto +++ b/api/types/microvm.proto @@ -4,7 +4,7 @@ package flintlock.types; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/weaveworks-liquidmetal/flintlock/api/types;types"; +option go_package = "github.com/liquidmetal-dev/flintlock/api/types;types"; // MicroVM represents a microvm machine that is created via a provider. message MicroVM { diff --git a/buf.lock b/buf.lock index eb6dc2d6..e9889ad9 100644 --- a/buf.lock +++ b/buf.lock @@ -4,8 +4,8 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: 463926e7ee924d46ad0a726e1cf4eacd + commit: f0e53af8f2fc4556b94f482688b57223 - remote: buf.build owner: grpc-ecosystem repository: grpc-gateway - commit: a1ecdc58eccd49aa8bea2a7a9022dc27 + commit: a48fcebcf8f140dd9d09359b9bb185a4 diff --git a/buf.yaml b/buf.yaml index e8395382..59985087 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,5 +1,5 @@ version: v1beta1 -name: buf.build/weaveworks-liquidmetal/flintlock +name: buf.build/liquidmetal-dev/flintlock deps: - buf.build/googleapis/googleapis - buf.build/grpc-ecosystem/grpc-gateway diff --git a/client/cloudinit/instance/metadata_test.go b/client/cloudinit/instance/metadata_test.go index 09dd1a0e..19fc3bb3 100644 --- a/client/cloudinit/instance/metadata_test.go +++ b/client/cloudinit/instance/metadata_test.go @@ -5,7 +5,7 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" + "github.com/liquidmetal-dev/flintlock/client/cloudinit/instance" ) const ( diff --git a/client/go.mod b/client/go.mod index 9381d012..a3261866 100644 --- a/client/go.mod +++ b/client/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks-liquidmetal/flintlock/client +module github.com/liquidmetal-dev/flintlock/client go 1.17 diff --git a/cmd/flintlock-metrics/main.go b/cmd/flintlock-metrics/main.go index ef4b66ef..fc85d712 100644 --- a/cmd/flintlock-metrics/main.go +++ b/cmd/flintlock-metrics/main.go @@ -3,8 +3,8 @@ package main import ( "os" + "github.com/liquidmetal-dev/flintlock/internal/command/metrics" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/internal/command/metrics" ) func main() { diff --git a/cmd/flintlockd/main.go b/cmd/flintlockd/main.go index 750994d3..3920bde6 100644 --- a/cmd/flintlockd/main.go +++ b/cmd/flintlockd/main.go @@ -3,7 +3,7 @@ package main import ( "log" - "github.com/weaveworks-liquidmetal/flintlock/internal/command" + "github.com/liquidmetal-dev/flintlock/internal/command" ) func main() { diff --git a/core/application/app.go b/core/application/app.go index 6a54d27f..7e952019 100644 --- a/core/application/app.go +++ b/core/application/app.go @@ -1,7 +1,7 @@ package application import ( - "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/ports" ) // App is the interface for the core application. In the future this could be split diff --git a/core/application/app_test.go b/core/application/app_test.go index 59895d35..f57c50be 100644 --- a/core/application/app_test.go +++ b/core/application/app_test.go @@ -12,14 +12,14 @@ import ( "github.com/spf13/afero" "sigs.k8s.io/yaml" - "github.com/weaveworks-liquidmetal/flintlock/api/events" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" - "github.com/weaveworks-liquidmetal/flintlock/core/application" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/ptr" + "github.com/liquidmetal-dev/flintlock/api/events" + "github.com/liquidmetal-dev/flintlock/client/cloudinit/instance" + "github.com/liquidmetal-dev/flintlock/core/application" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/ptr" ) const ( diff --git a/core/application/commands.go b/core/application/commands.go index 8f573cb5..8032c45b 100644 --- a/core/application/commands.go +++ b/core/application/commands.go @@ -5,16 +5,16 @@ import ( "encoding/base64" "fmt" + "github.com/liquidmetal-dev/flintlock/api/events" + "github.com/liquidmetal-dev/flintlock/client/cloudinit" + "github.com/liquidmetal-dev/flintlock/client/cloudinit/instance" + coreerrs "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/validation" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/api/events" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" - coreerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/validation" "sigs.k8s.io/yaml" ) diff --git a/core/application/errors.go b/core/application/errors.go index 61917bfc..fe432c3a 100644 --- a/core/application/errors.go +++ b/core/application/errors.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/models" ) var errUIDRequired = errors.New("uid is required") diff --git a/core/application/query.go b/core/application/query.go index 551ee87b..338e6f39 100644 --- a/core/application/query.go +++ b/core/application/query.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" ) func (a *app) GetMicroVM(ctx context.Context, uid string) (*models.MicroVM, error) { diff --git a/core/application/reconcile.go b/core/application/reconcile.go index f7456447..a480e00d 100644 --- a/core/application/reconcile.go +++ b/core/application/reconcile.go @@ -5,15 +5,15 @@ import ( "fmt" "time" + "github.com/liquidmetal-dev/flintlock/api/events" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/plans" + "github.com/liquidmetal-dev/flintlock/core/ports" + portsctx "github.com/liquidmetal-dev/flintlock/core/ports/context" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/api/events" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/plans" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) const backoffBaseInSeconds = 20 diff --git a/core/models/network_test.go b/core/models/network_test.go index 03cbc67e..c9e810e0 100644 --- a/core/models/network_test.go +++ b/core/models/network_test.go @@ -3,8 +3,8 @@ package models_test import ( "testing" + "github.com/liquidmetal-dev/flintlock/core/models" g "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" ) func TestIPAddressCIDR_IsIPv4(t *testing.T) { diff --git a/core/models/vmid.go b/core/models/vmid.go index b49a5b4d..901fa2db 100644 --- a/core/models/vmid.go +++ b/core/models/vmid.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - coreerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + coreerrs "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" ) const ( diff --git a/core/models/vmid_test.go b/core/models/vmid_test.go index f2b4eed7..50018e0c 100644 --- a/core/models/vmid_test.go +++ b/core/models/vmid_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/models" ) const ( diff --git a/core/plans/helper_test.go b/core/plans/helper_test.go index 5a77d0df..ce6e7183 100644 --- a/core/plans/helper_test.go +++ b/core/plans/helper_test.go @@ -4,10 +4,10 @@ import ( "time" "github.com/golang/mock/gomock" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) const ( diff --git a/core/plans/matcher_test.go b/core/plans/matcher_test.go index 9524fe70..569bffe5 100644 --- a/core/plans/matcher_test.go +++ b/core/plans/matcher_test.go @@ -3,8 +3,8 @@ package plans_test import ( "strings" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" ) type hostDeviceNameMatcher struct{} diff --git a/core/plans/microvm_create_update.go b/core/plans/microvm_create_update.go index b9000e85..8910b7a8 100644 --- a/core/plans/microvm_create_update.go +++ b/core/plans/microvm_create_update.go @@ -4,17 +4,17 @@ import ( "context" "fmt" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/cloudinit" - - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/network" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" + "github.com/liquidmetal-dev/flintlock/core/steps/cloudinit" + + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + portsctx "github.com/liquidmetal-dev/flintlock/core/ports/context" + "github.com/liquidmetal-dev/flintlock/core/steps/microvm" + "github.com/liquidmetal-dev/flintlock/core/steps/network" + "github.com/liquidmetal-dev/flintlock/core/steps/runtime" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" ) type CreateOrUpdatePlanInput struct { diff --git a/core/plans/microvm_create_update_test.go b/core/plans/microvm_create_update_test.go index 2ddce8ee..072c5851 100644 --- a/core/plans/microvm_create_update_test.go +++ b/core/plans/microvm_create_update_test.go @@ -7,10 +7,10 @@ import ( "github.com/golang/mock/gomock" . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/plans" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/plans" + "github.com/liquidmetal-dev/flintlock/core/ports" + portsctx "github.com/liquidmetal-dev/flintlock/core/ports/context" ) func TestMicroVMCreateOrUpdatePlan(t *testing.T) { diff --git a/core/plans/microvm_delete.go b/core/plans/microvm_delete.go index bb0643b8..9f8f0f6d 100644 --- a/core/plans/microvm_delete.go +++ b/core/plans/microvm_delete.go @@ -5,17 +5,17 @@ import ( "fmt" "path" - "github.com/weaveworks-liquidmetal/flintlock/api/events" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/event" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/network" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" + "github.com/liquidmetal-dev/flintlock/api/events" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + portsctx "github.com/liquidmetal-dev/flintlock/core/ports/context" + "github.com/liquidmetal-dev/flintlock/core/steps/event" + "github.com/liquidmetal-dev/flintlock/core/steps/microvm" + "github.com/liquidmetal-dev/flintlock/core/steps/network" + "github.com/liquidmetal-dev/flintlock/core/steps/runtime" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" ) type DeletePlanInput struct { diff --git a/core/plans/microvm_delete_test.go b/core/plans/microvm_delete_test.go index 4f7d34c3..d6afce87 100644 --- a/core/plans/microvm_delete_test.go +++ b/core/plans/microvm_delete_test.go @@ -8,11 +8,11 @@ import ( "github.com/golang/mock/gomock" . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/plans" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - portsctx "github.com/weaveworks-liquidmetal/flintlock/core/ports/context" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/plans" + "github.com/liquidmetal-dev/flintlock/core/ports" + portsctx "github.com/liquidmetal-dev/flintlock/core/ports/context" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" ) func TestMicroVMDeletePlan(t *testing.T) { diff --git a/core/plans/types.go b/core/plans/types.go index 02452ede..c5d93769 100644 --- a/core/plans/types.go +++ b/core/plans/types.go @@ -1,8 +1,8 @@ package plans import ( + "github.com/liquidmetal-dev/flintlock/core/ports" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) // Providers input is a type to be used as input to plans. diff --git a/core/ports/context/context.go b/core/ports/context/context.go index b66243c1..26c2d905 100644 --- a/core/ports/context/context.go +++ b/core/ports/context/context.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/ports" ) type portsCtxKeyType string diff --git a/core/ports/repositories.go b/core/ports/repositories.go index 39529313..a21a4e69 100644 --- a/core/ports/repositories.go +++ b/core/ports/repositories.go @@ -3,7 +3,7 @@ package ports import ( "context" - "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/models" ) type RepositoryGetOptions struct { diff --git a/core/ports/services.go b/core/ports/services.go index 6322cd51..f5cb4b97 100644 --- a/core/ports/services.go +++ b/core/ports/services.go @@ -4,8 +4,8 @@ import ( "context" "time" - mvmv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks-liquidmetal/flintlock/core/models" + mvmv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" + "github.com/liquidmetal-dev/flintlock/core/models" ) // MicroVMService is the port definition for a microvm service. @@ -164,7 +164,7 @@ const ( // DiskCreateInput are the input options for creating a disk. type DiskCreateInput struct { - //Path is the filesystem path of where to create the disk. + // Path is the filesystem path of where to create the disk. Path string // Size is how big the disk should be. It uses human readable formats // such as 8Mb, 10Kb. diff --git a/core/ports/usecases.go b/core/ports/usecases.go index 203145b2..d907cc7f 100644 --- a/core/ports/usecases.go +++ b/core/ports/usecases.go @@ -3,7 +3,7 @@ package ports import ( "context" - "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/models" ) // MicroVMCommandUseCases is the interface for uses cases that are actions (a.k.a commands) against a microvm. diff --git a/core/steps/cloudinit/disk_mount.go b/core/steps/cloudinit/disk_mount.go index f3c86564..8e888d12 100644 --- a/core/steps/cloudinit/disk_mount.go +++ b/core/steps/cloudinit/disk_mount.go @@ -8,11 +8,11 @@ import ( "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/userdata" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" + "github.com/liquidmetal-dev/flintlock/client/cloudinit" + "github.com/liquidmetal-dev/flintlock/client/cloudinit/userdata" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" ) func NewDiskMountStep(vm *models.MicroVM) planner.Procedure { diff --git a/core/steps/event/publish.go b/core/steps/event/publish.go index 63f73c5c..082fc81a 100644 --- a/core/steps/event/publish.go +++ b/core/steps/event/publish.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewPublish(topic string, event interface{}, eventSvc ports.EventService) planner.Procedure { diff --git a/core/steps/event/publish_test.go b/core/steps/event/publish_test.go index 4c9ae3cf..42624588 100644 --- a/core/steps/event/publish_test.go +++ b/core/steps/event/publish_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/liquidmetal-dev/flintlock/api/events" + "github.com/liquidmetal-dev/flintlock/core/steps/event" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/api/events" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/event" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) const ( diff --git a/core/steps/microvm/create.go b/core/steps/microvm/create.go index 58111bf5..4dcc2423 100644 --- a/core/steps/microvm/create.go +++ b/core/steps/microvm/create.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewCreateStep(vm *models.MicroVM, vmSvc ports.MicroVMService) planner.Procedure { diff --git a/core/steps/microvm/create_test.go b/core/steps/microvm/create_test.go index d3e4d353..c346ef4f 100644 --- a/core/steps/microvm/create_test.go +++ b/core/steps/microvm/create_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/mock/gomock" + internalerr "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/steps/microvm" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMToCreate() *models.MicroVM { diff --git a/core/steps/microvm/delete.go b/core/steps/microvm/delete.go index 2cb033d4..47156397 100644 --- a/core/steps/microvm/delete.go +++ b/core/steps/microvm/delete.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewDeleteStep(vm *models.MicroVM, vmSvc ports.MicroVMService) planner.Procedure { diff --git a/core/steps/microvm/delete_test.go b/core/steps/microvm/delete_test.go index 06c90f61..3917110b 100644 --- a/core/steps/microvm/delete_test.go +++ b/core/steps/microvm/delete_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/mock/gomock" + internalerr "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/steps/microvm" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMToDelete() *models.MicroVM { diff --git a/core/steps/microvm/start.go b/core/steps/microvm/start.go index 6fa7c289..e0c51efa 100644 --- a/core/steps/microvm/start.go +++ b/core/steps/microvm/start.go @@ -5,12 +5,12 @@ import ( "fmt" "time" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewStartStep( diff --git a/core/steps/microvm/start_test.go b/core/steps/microvm/start_test.go index 64adaddf..32b68900 100644 --- a/core/steps/microvm/start_test.go +++ b/core/steps/microvm/start_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/mock/gomock" + internalerr "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/steps/microvm" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/microvm" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) const bootTimeInSeconds = 1 diff --git a/core/steps/network/interface_create.go b/core/steps/network/interface_create.go index fc5e78ea..e02b0d3c 100644 --- a/core/steps/network/interface_create.go +++ b/core/steps/network/interface_create.go @@ -4,13 +4,13 @@ import ( "context" "fmt" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/network" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/network" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewNetworkInterface(vmid *models.VMID, diff --git a/core/steps/network/interface_create_test.go b/core/steps/network/interface_create_test.go index 068323e3..b6083ffe 100644 --- a/core/steps/network/interface_create_test.go +++ b/core/steps/network/interface_create_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/steps/network" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/network" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func TestNewNetworkInterface_everythingIsEmpty(t *testing.T) { diff --git a/core/steps/network/interface_delete.go b/core/steps/network/interface_delete.go index 5aae6e07..984da2e0 100644 --- a/core/steps/network/interface_delete.go +++ b/core/steps/network/interface_delete.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func DeleteNetworkInterface(vmid *models.VMID, diff --git a/core/steps/network/interface_delete_test.go b/core/steps/network/interface_delete_test.go index ea0164c2..15b96d30 100644 --- a/core/steps/network/interface_delete_test.go +++ b/core/steps/network/interface_delete_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/steps/network" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" "github.com/vishvananda/netlink" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/network" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func TestDeleteNetworkInterface_doesNotExist(t *testing.T) { diff --git a/core/steps/network/matcher_test.go b/core/steps/network/matcher_test.go index 41c2c69e..f10b940d 100644 --- a/core/steps/network/matcher_test.go +++ b/core/steps/network/matcher_test.go @@ -3,7 +3,7 @@ package network_test import ( "strings" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/ports" ) type hostDeviceNameMatcher struct{} diff --git a/core/steps/network/testconst_test.go b/core/steps/network/testconst_test.go index 12025cc1..34351692 100644 --- a/core/steps/network/testconst_test.go +++ b/core/steps/network/testconst_test.go @@ -1,6 +1,6 @@ package network_test -import "github.com/weaveworks-liquidmetal/flintlock/core/models" +import "github.com/liquidmetal-dev/flintlock/core/models" const ( vmName = "testvm" diff --git a/core/steps/runtime/dir_create.go b/core/steps/runtime/dir_create.go index 4a5688dd..a2d9472a 100644 --- a/core/steps/runtime/dir_create.go +++ b/core/steps/runtime/dir_create.go @@ -5,10 +5,10 @@ import ( "fmt" "os" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewCreateDirectory(dir string, mode os.FileMode, fs afero.Fs) planner.Procedure { diff --git a/core/steps/runtime/dir_create_test.go b/core/steps/runtime/dir_create_test.go index c9eebec6..8ac48a26 100644 --- a/core/steps/runtime/dir_create_test.go +++ b/core/steps/runtime/dir_create_test.go @@ -9,7 +9,7 @@ import ( g "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" + "github.com/liquidmetal-dev/flintlock/core/steps/runtime" ) func TestCreateDirectory_NotExists(t *testing.T) { diff --git a/core/steps/runtime/dir_delete.go b/core/steps/runtime/dir_delete.go index 9a5d1c60..35cdb905 100644 --- a/core/steps/runtime/dir_delete.go +++ b/core/steps/runtime/dir_delete.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewDeleteDirectory(dir string, fs afero.Fs) planner.Procedure { diff --git a/core/steps/runtime/dir_delete_test.go b/core/steps/runtime/dir_delete_test.go index 24f73dfc..fd850b03 100644 --- a/core/steps/runtime/dir_delete_test.go +++ b/core/steps/runtime/dir_delete_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" + "github.com/liquidmetal-dev/flintlock/core/steps/runtime" g "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" ) func TestDeleteDirectory_NotExists(t *testing.T) { diff --git a/core/steps/runtime/initrd_mount.go b/core/steps/runtime/initrd_mount.go index 8284eb0c..53ca4802 100644 --- a/core/steps/runtime/initrd_mount.go +++ b/core/steps/runtime/initrd_mount.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + cerrs "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - cerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewInitrdMount(vm *models.MicroVM, imageService ports.ImageService) planner.Procedure { diff --git a/core/steps/runtime/initrd_mount_test.go b/core/steps/runtime/initrd_mount_test.go index 03c45d42..bd49e786 100644 --- a/core/steps/runtime/initrd_mount_test.go +++ b/core/steps/runtime/initrd_mount_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/mock/gomock" + internalerr "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/steps/runtime" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMWithInitrd() *models.MicroVM { diff --git a/core/steps/runtime/kernel_mount.go b/core/steps/runtime/kernel_mount.go index 77be30a2..730420a3 100644 --- a/core/steps/runtime/kernel_mount.go +++ b/core/steps/runtime/kernel_mount.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + cerrs "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - cerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewKernelMount(vm *models.MicroVM, imageService ports.ImageService) planner.Procedure { diff --git a/core/steps/runtime/kernel_mount_test.go b/core/steps/runtime/kernel_mount_test.go index ed30e41f..a4a91e9c 100644 --- a/core/steps/runtime/kernel_mount_test.go +++ b/core/steps/runtime/kernel_mount_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/mock/gomock" + internalerr "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/steps/runtime" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMWithKernel() *models.MicroVM { diff --git a/core/steps/runtime/repo_release.go b/core/steps/runtime/repo_release.go index 05c14052..307ce3ff 100644 --- a/core/steps/runtime/repo_release.go +++ b/core/steps/runtime/repo_release.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewRepoRelease(vm *models.MicroVM, repo ports.MicroVMRepository) planner.Procedure { diff --git a/core/steps/runtime/repo_release_test.go b/core/steps/runtime/repo_release_test.go index 379f4fa5..b7a8ca5e 100644 --- a/core/steps/runtime/repo_release_test.go +++ b/core/steps/runtime/repo_release_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/golang/mock/gomock" + internalerrors "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/steps/runtime" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - internalerrors "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVM() *models.MicroVM { diff --git a/core/steps/runtime/volume_mount.go b/core/steps/runtime/volume_mount.go index 301b12d0..69176ea4 100644 --- a/core/steps/runtime/volume_mount.go +++ b/core/steps/runtime/volume_mount.go @@ -4,12 +4,12 @@ import ( "context" "fmt" + cerrs "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/planner" "github.com/sirupsen/logrus" - cerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" ) func NewVolumeMount(vmid *models.VMID, diff --git a/core/steps/runtime/volume_mount_test.go b/core/steps/runtime/volume_mount_test.go index 708c6a7e..fd7f18a5 100644 --- a/core/steps/runtime/volume_mount_test.go +++ b/core/steps/runtime/volume_mount_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/golang/mock/gomock" + internalerr "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/steps/runtime" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" - internalerr "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/core/steps/runtime" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) func testVMWithMount() *models.MicroVM { diff --git a/docs/adr/0003-grpc-validation.md b/docs/adr/0003-grpc-validation.md index 3227f36c..42d8f593 100644 --- a/docs/adr/0003-grpc-validation.md +++ b/docs/adr/0003-grpc-validation.md @@ -1,9 +1,9 @@ # 3. MicroVM Spec Validation -* Status: Proposed -* Date: 2021-10-14 -* Authors: @jmickey -* Deciders: @jmickey @richardcase +- Status: Proposed +- Date: 2021-10-14 +- Authors: @jmickey +- Deciders: @jmickey @richardcase ## Context @@ -23,8 +23,9 @@ As a result, neither of these solutions is fit for purpose. Alternative options to utilising these Protobuf plugins are: 1. Fork one of the above plugins and maintain it for our own purposes. -2. Perform validation on the model. This would be done either in the implementation of the use case - e.g. https://github.com/weaveworks-liquidmetal/flintlock/blob/main/core/application/commands.go#L14, or the conversion from the request type to the model: e.g. https://github.com/weaveworks-liquidmetal/flintlock/blob/main/infrastructure/grpc/server.go#L33. - - For this we could utilise the [go-playground/validator](https://github.com/go-playground/validator) project. +2. Perform validation on the model. This would be done either in the implementation of the use case - e.g. https://github.com/liquidmetal-dev/flintlock/blob/main/core/application/commands.go#L14, or the conversion from the request type to the model: e.g. https://github.com/liquidmetal-dev/flintlock/blob/main/infrastructure/grpc/server.go#L33. + +- For this we could utilise the [go-playground/validator](https://github.com/go-playground/validator) project. ## Decision @@ -36,4 +37,4 @@ We should investigate and utilise the [go-playground/validator](https://github.c ## Consequences -We should continue to revisit this decision periodically. There would still be value in being able to do early request level validation via a gRPC interceptor. We should monitor the Protobuf validation plugins mentioned above and reevaluate their fit for purpose if/when they are updated. \ No newline at end of file +We should continue to revisit this decision periodically. There would still be value in being able to do early request level validation via a gRPC interceptor. We should monitor the Protobuf validation plugins mentioned above and reevaluate their fit for purpose if/when they are updated. diff --git a/docs/adr/0005-network-device-name.md b/docs/adr/0005-network-device-name.md index 2ee2b0df..3f9c988e 100644 --- a/docs/adr/0005-network-device-name.md +++ b/docs/adr/0005-network-device-name.md @@ -1,9 +1,9 @@ # 5. Network Device Name on Host -* Status: accepted -* Date: 2021-11-08 -* Authors: @yitsushi -* Deciders: @Callisto13 @jmickey @richardcase @yitsushi +- Status: accepted +- Date: 2021-11-08 +- Authors: @yitsushi +- Deciders: @Callisto13 @jmickey @richardcase @yitsushi ## Context @@ -16,10 +16,10 @@ device name on the host. Considered options: -* Generate a UUID and use the first N bytes. -* Generate a hash of the Name and Namespace combination and use the first N +- Generate a UUID and use the first N bytes. +- Generate a hash of the Name and Namespace combination and use the first N bytes. -* Generate a random value. +- Generate a random value. [^1]: https://elixir.bootlin.com/linux/v5.6/source/include/linux/netdevice.h#L1826 [^2]: https://elixir.bootlin.com/linux/v5.6/source/include/uapi/linux/if.h#L33 @@ -46,4 +46,4 @@ As a result, it is possible to leak resources, when the MicroVM deletion failed and we lost track of a network device status from MicroVMSpec. For that reason, [Resource cleanup ADR #90][issue-90] priority might be raised to higher priority. -[issue-90]: https://github.com/weaveworks-liquidmetal/flintlock/issues/90 +[issue-90]: https://github.com/liquidmetal-dev/flintlock/issues/90 diff --git a/docs/adr/0234-update-api.md b/docs/adr/0234-update-api.md index 05528cff..ba07f30d 100644 --- a/docs/adr/0234-update-api.md +++ b/docs/adr/0234-update-api.md @@ -1,10 +1,10 @@ # Firecracker Patch Limitations & The Flintlock Update API -* Status: accepted -* Date: 2021-11-08 -* Authors: @jmickey -* Deciders: @jmickey @richardcase @Callisto13 @yitsushi -* ADR Discussion: https://github.com/weaveworks-liquidmetal/flintlock/discussions/234 +- Status: accepted +- Date: 2021-11-08 +- Authors: @jmickey +- Deciders: @jmickey @richardcase @Callisto13 @yitsushi +- ADR Discussion: https://github.com/liquidmetal-dev/flintlock/discussions/234 ## Context @@ -26,15 +26,15 @@ As a result of discovering these limitations, the `flintlock` update gRPC API an Moving forward there are a few possible directions that could be taken: 1. **Provide no support for in-place updates**. The primary consumer of the `flintlock` API will be the MicroVM Cluster API (CAPI) provider, which doesn't support updates. As a result it would be perfectly valid for us to decide that we won't support any in-place update capabilities, and instead all changes to MicroVM specs will result in recreation. -2. **Implement in-place updates for valid operations**. Rate limiting, limited unmounted volume changes, metadata, and balloon devices are able to updated in-place. +2. **Implement in-place updates for valid operations**. Rate limiting, limited unmounted volume changes, metadata, and balloon devices are able to updated in-place. 3. **Only update metadata**. The metadata service data store is probably the most logical place where in-place updates would make sense within the context of possible consumers (CAPI). ## Decision -**Provide no support for in-place updates**. +**Provide no support for in-place updates**. The primary consumer of the `flintlock` API will be the MicroVM Cluster API (CAPI) provider, which doesn't support updates. As a result it would be perfectly valid for us to decide that we won't support any in-place update capabilities, and instead all changes to MicroVM specs will result in recreation. ## Consequences -Having to recreate MicroVMs in order to support spec updates could possibly lead to issues where the host does not have sufficient resources in order to support `CreateBeforeDelete` style updates, where a new MicroVM is created, workloads are migrated, and the old MicroVM is removed. However, this is less of a consequence of this decision, and more a consequence of the inherent limitations of the Firecracker MicroVM provider. \ No newline at end of file +Having to recreate MicroVMs in order to support spec updates could possibly lead to issues where the host does not have sufficient resources in order to support `CreateBeforeDelete` style updates, where a new MicroVM is created, workloads are migrated, and the old MicroVM is removed. However, this is less of a consequence of this decision, and more a consequence of the inherent limitations of the Firecracker MicroVM provider. diff --git a/docs/adr/0241-opinionated-api-changes.md b/docs/adr/0241-opinionated-api-changes.md index 55bc8083..a1fd2a6a 100644 --- a/docs/adr/0241-opinionated-api-changes.md +++ b/docs/adr/0241-opinionated-api-changes.md @@ -1,10 +1,10 @@ # Opinionated API Changes -* Status: accepted -* Date: 2021-11-10 -* Authors: @jmickey -* Deciders: @jmickey @richardcase @Callisto13 @yitsushi -* ADR Discussion: https://github.com/weaveworks-liquidmetal/flintlock/discussions/241 +- Status: accepted +- Date: 2021-11-10 +- Authors: @jmickey +- Deciders: @jmickey @richardcase @Callisto13 @yitsushi +- ADR Discussion: https://github.com/liquidmetal-dev/flintlock/discussions/241 ## Context @@ -18,14 +18,14 @@ The scope of this proposal is not to decide on what aspects of MicroVM specifica Below are some proposed default configurations, along with default values where relevant. -| Name | Description | Model | Value | -|----------|---|---------|---------| +| Name | Description | Model | Value | +| -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------- | -------------------------------------------------------- | | MicroVM Resources | Provide default values for MicroVM VCPUs and RAM. This can be difficult to get right, but is even supported in Firecracker itself. However, Firecracker defaults to 1 VCPU and 128MB of RAM, which is probably a bit small for our particular use case. | `MicroVM.VCPU`
`MicroVM.MemoryInMb` | `vcpu: 2`
`memory_in_mb: 1024` | -| Default Namespace | If a namespace is not provided than default to using the `default` namespace | `MicroVM.Namespace` | `default` | -| Metadata network interface | Automatically generate metadata network interface with address of `169.254.0.1/16` and `allow_metadata_req: true` | `MicroVM.NetworkInterfaces` | `169.254.0.1/16` | -| Remove allow metadata requests | If the metadata network interface is created automatically then we should remove the `allow_metadata_req` option on the network interface model | `MicroVM.NetworkInterfaces` | | -| Network interface name | Automatically generate the network interface name when one is not provided. | `MicroVM.NetworkInterfaces[*].GuestDeviceName` | | -| `RootVolume` and `AdditionalVolumes[]` | Separate the `Volumes` field in the model into two fields. `RootVolume` specifically for the root volume, allowing us to hide the `is_root` flag, and `AdditionalVolumes[]` for non-root volumes. | `MicroVM.Volumes` | `MicroVM.RootVolume` and `MicroVM.AdditionalVolumes[]` | +| Default Namespace | If a namespace is not provided than default to using the `default` namespace | `MicroVM.Namespace` | `default` | +| Metadata network interface | Automatically generate metadata network interface with address of `169.254.0.1/16` and `allow_metadata_req: true` | `MicroVM.NetworkInterfaces` | `169.254.0.1/16` | +| Remove allow metadata requests | If the metadata network interface is created automatically then we should remove the `allow_metadata_req` option on the network interface model | `MicroVM.NetworkInterfaces` | | +| Network interface name | Automatically generate the network interface name when one is not provided. | `MicroVM.NetworkInterfaces[*].GuestDeviceName` | | +| `RootVolume` and `AdditionalVolumes[]` | Separate the `Volumes` field in the model into two fields. `RootVolume` specifically for the root volume, allowing us to hide the `is_root` flag, and `AdditionalVolumes[]` for non-root volumes. | `MicroVM.Volumes` | `MicroVM.RootVolume` and `MicroVM.AdditionalVolumes[]` | ### Unknowns/Discussion @@ -52,7 +52,7 @@ With the defaults as described in Default Configurations, a minimal MicroVM crea { "type": 0 } - ], + ] } } ``` @@ -61,15 +61,16 @@ With the defaults as described in Default Configurations, a minimal MicroVM crea Implement the following changes to the Flintlock API: -| Name | Description | Model | Value | -|----------|---|---------|---------| +| Name | Description | Model | Value | +| -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------- | -------------------------------------------------------- | | MicroVM Resources | Provide default values for MicroVM VCPUs and RAM. This can be difficult to get right, but is even supported in Firecracker itself. However, Firecracker defaults to 1 VCPU and 128MB of RAM, which is probably a bit small for our particular use case. | `MicroVM.VCPU`
`MicroVM.MemoryInMb` | `vcpu: 2`
`memory_in_mb: 1024` | -| Default Namespace | If a namespace is not provided than default to using the `default` namespace | `MicroVM.Namespace` | `default` | -| Metadata network interface | Automatically generate metadata network interface with address of `169.254.0.1/16` and `allow_metadata_req: true` | `MicroVM.NetworkInterfaces` | `169.254.0.1/16` | -| Remove allow metadata requests | If the metadata network interface is created automatically then we should remove the `allow_metadata_req` option on the network interface model | `MicroVM.NetworkInterfaces` | | -| `RootVolume` and `AdditionalVolumes[]` | Separate the `Volumes` field in the model into two fields. `RootVolume` specifically for the root volume, allowing us to hide the `is_root` flag, and `AdditionalVolumes[]` for non-root volumes. | `MicroVM.Volumes` | `MicroVM.RootVolume` and `MicroVM.AdditionalVolumes[]` | +| Default Namespace | If a namespace is not provided than default to using the `default` namespace | `MicroVM.Namespace` | `default` | +| Metadata network interface | Automatically generate metadata network interface with address of `169.254.0.1/16` and `allow_metadata_req: true` | `MicroVM.NetworkInterfaces` | `169.254.0.1/16` | +| Remove allow metadata requests | If the metadata network interface is created automatically then we should remove the `allow_metadata_req` option on the network interface model | `MicroVM.NetworkInterfaces` | | +| `RootVolume` and `AdditionalVolumes[]` | Separate the `Volumes` field in the model into two fields. `RootVolume` specifically for the root volume, allowing us to hide the `is_root` flag, and `AdditionalVolumes[]` for non-root volumes. | `MicroVM.Volumes` | `MicroVM.RootVolume` and `MicroVM.AdditionalVolumes[]` | Note: This proposal _specifically_ avoids diving too deep into implementation details. E.g. Automatically generating a network device name will require us to validate that there are no conflicts in the name we use. These implementation details belong within the scope of the implementation phase and PR discussion. ## Consequences - \ No newline at end of file + + diff --git a/docs/adr/0246-linters.md b/docs/adr/0246-linters.md index 0d5babdf..2407727d 100644 --- a/docs/adr/0246-linters.md +++ b/docs/adr/0246-linters.md @@ -33,10 +33,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" ) ``` @@ -45,7 +45,7 @@ import ( > Tool for detection of FIXME, TODO and other comment keywords. No `TODO`, `FIXME`, or `BUG` comments should live in the code without filed -issues to track them. The reason is simple: if we have a comment with "todo", +issues to track them. The reason is simple: if we have a comment with "todo", it has the same value as not having that comment at all, because no one will care about it. @@ -112,6 +112,7 @@ if !exists { } } ``` +
@@ -138,6 +139,7 @@ if !exists { } } ``` +
**Error check** @@ -156,6 +158,7 @@ if !exists { return ports.MicroVMStatePending, nil } ``` +
@@ -174,6 +177,7 @@ if !exists { return ports.MicroVMStatePending, nil } ``` +
## Description on ignored linters @@ -182,7 +186,6 @@ It is possible to add a `//nolint` command for a specific file, block, or line, but it's not recommended. If it has a reason why we need that `//nolint`, tell us a why. - ### Example ```go @@ -198,11 +201,11 @@ process := exec.Command(options.Command, options.Args...) # Consequences -* All `todo` comments have a GitHub reference. -* Code will be easier to read and update. -* If a linter rule is ignored, the code itself documents why. -* No unnecessary global variables, less painful debugging what changed that value. -* Spell checker in comments with GB locale. No more `maintanence` or `color`. -* Some of the rules are hard to keep in mind first. +- All `todo` comments have a GitHub reference. +- Code will be easier to read and update. +- If a linter rule is ignored, the code itself documents why. +- No unnecessary global variables, less painful debugging what changed that value. +- Spell checker in comments with GB locale. No more `maintanence` or `color`. +- Some of the rules are hard to keep in mind first. -Discussion: https://github.com/weaveworks-liquidmetal/flintlock/discussions/246 +Discussion: https://github.com/liquidmetal-dev/flintlock/discussions/246 diff --git a/docs/releasing.md b/docs/releasing.md index 21c6cdac..b99dab0d 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -16,35 +16,35 @@ git describe --tags --abbrev=0 ## Create tag -* Checkout upstream main -* Create a tag with the version number: +- Checkout upstream main +- Create a tag with the version number: ```bash RELEASE_VERSION=v0.1.0-alpha.1 git tag -s "${RELEASE_VERSION}" -m "${RELEASE_VERSION}" ``` -* Push the tag (to upstream if working from a fork) +- Push the tag (to upstream if working from a fork) -``` bash +```bash git push origin "${RELEASE_VERSION}" ``` -* Check the [release](https://github.com/weaveworks-liquidmetal/flintlock/actions/workflows/release.yml) GitHub Actions workflow completes successfully. +- Check the [release](https://github.com/liquidmetal-dev/flintlock/actions/workflows/release.yml) GitHub Actions workflow completes successfully. This may take a few minutes as it runs the e2es as part of the process. ## Edit & Publish GitHub Release -* Got to the draft release in GitHub. -* Make any edits to generated release notes - * If there are any breaking changes then manually add a note at the beginning of the release notes informing the user what they need to be aware of/do. - * Sometimes you may want to combine changes into 1 line -* If this is a pre-release tick `This is a pre-release` -* Publish the draft release and when asked say yes to creating a discussion. +- Got to the draft release in GitHub. +- Make any edits to generated release notes + - If there are any breaking changes then manually add a note at the beginning of the release notes informing the user what they need to be aware of/do. + - Sometimes you may want to combine changes into 1 line +- If this is a pre-release tick `This is a pre-release` +- Publish the draft release and when asked say yes to creating a discussion. ## Commit a new `buf` tag -We have gRPC API docs hosted on [buf.build](https://buf.build/weaveworks-liquidmetal/flintlock). +We have gRPC API docs hosted on [buf.build](https://buf.build/liquidmetal-dev/flintlock). If the API has changed, you'll need to update these. Log in creds can be found in the shared Team Quicksilver 1Pass vault. @@ -55,7 +55,7 @@ Log in locally: ``` buf registry login -# username is weaveworks-liquidmetal +# username is liquidmetal-dev # key is the token you generated ``` diff --git a/flintlockd.service b/flintlockd.service index bfa609bd..07b5268f 100644 --- a/flintlockd.service +++ b/flintlockd.service @@ -14,7 +14,7 @@ [Unit] Description=flintlock microvm service -Documentation=https://weaveworks-liquidmetal.github.io/flintlock/ +Documentation=https://www.liquidmetal.dev Requires=containerd.service [Service] diff --git a/go.mod b/go.mod index f117aaf4..fafea625 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/weaveworks-liquidmetal/flintlock +module github.com/liquidmetal-dev/flintlock -go 1.20 +go 1.22 replace ( // We are pinning this for now, as one of our dependencies has this verison @@ -9,8 +9,8 @@ replace ( github.com/containernetworking/cni => github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins => github.com/containernetworking/plugins v1.1.1 - github.com/weaveworks-liquidmetal/flintlock/api => ./api - github.com/weaveworks-liquidmetal/flintlock/client => ./client + github.com/liquidmetal-dev/flintlock/api => ./api + github.com/liquidmetal-dev/flintlock/client => ./client ) require ( @@ -52,9 +52,9 @@ require ( github.com/docker/go-units v0.5.0 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 + github.com/liquidmetal-dev/flintlock/api v0.0.0-20230211152005-2177e42d0ee6 + github.com/liquidmetal-dev/flintlock/client v0.0.0-20230211152005-2177e42d0ee6 github.com/urfave/cli/v2 v2.25.7 - github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230211152005-2177e42d0ee6 - github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230211152005-2177e42d0ee6 github.com/yitsushi/file-tailor v1.0.0 gopkg.in/yaml.v2 v2.4.0 sigs.k8s.io/yaml v1.3.0 @@ -94,6 +94,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/subcommands v1.0.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -118,6 +119,7 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pkg/xattr v0.4.9 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect diff --git a/go.sum b/go.sum index 88bf4b76..847bc4fa 100644 --- a/go.sum +++ b/go.sum @@ -488,6 +488,7 @@ github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k= github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= diff --git a/hack/scripts/README.md b/hack/scripts/README.md index 87acbf27..6975cd60 100644 --- a/hack/scripts/README.md +++ b/hack/scripts/README.md @@ -15,7 +15,7 @@ Installation: ./hack/scripts/provision.sh --help # if you have not -wget https://raw.githubusercontent.com/weaveworks/flintlock/main/hack/scripts/provision.sh +wget https://raw.githubusercontent.com/liquidmetal-dev/flintlock/main/hack/scripts/provision.sh chmod +x provision.sh ./provision.sh --help diff --git a/hack/scripts/provision.sh b/hack/scripts/provision.sh index 3e164c0e..7154ac3a 100755 --- a/hack/scripts/provision.sh +++ b/hack/scripts/provision.sh @@ -38,7 +38,7 @@ CONTAINERD_SYSTEMD_SVC="" # flintlock FLINTLOCK_VERSION="${FLINTLOCK:=$DEFAULT_VERSION}" FLINTLOCK_BIN="flintlockd" -FLINTLOCK_REPO="weaveworks/flintlock" +FLINTLOCK_REPO="liquidmetal-dev/flintlock" FLINTLOCKD_SERVICE_FILE="/etc/systemd/system/flintlockd.service" FLINTLOCKD_CONFIG_PATH="/etc/opt/flintlockd/config.yaml" diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 955f35d4..0981c559 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,11 +1,11 @@ -module github.com/weaveworks-liquidmetal/flintlock/hack/tools +module github.com/liquidmetal-dev/flintlock/hack/tools go 1.17 require ( github.com/golang/mock v1.6.0 github.com/golangci/golangci-lint v1.43.0 - github.com/google/wire v0.5.0 + github.com/google/wire v0.6.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0 github.com/onsi/ginkgo v1.16.4 github.com/pseudomuto/protoc-gen-doc v1.5.0 @@ -71,7 +71,7 @@ require ( github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect github.com/google/go-cmp v0.5.8 // indirect - github.com/google/subcommands v1.0.1 // indirect + github.com/google/subcommands v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 // indirect github.com/gostaticanalysis/analysisutil v0.7.1 // indirect @@ -158,13 +158,11 @@ require ( github.com/ultraware/whitespace v0.0.4 // indirect github.com/uudashr/gocognit v1.0.5 // indirect github.com/yeya24/promlinter v0.1.0 // indirect - golang.org/x/crypto v0.7.0 // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect - golang.org/x/tools v0.6.0 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.org/x/crypto v0.18.0 // indirect + golang.org/x/mod v0.14.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.17.0 // indirect google.golang.org/genproto v0.0.0-20211101144312-62acf1d99145 // indirect gopkg.in/ini.v1 v1.63.2 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect diff --git a/hack/tools/go.sum b/hack/tools/go.sum index a6debab0..92adcfc5 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -60,7 +60,6 @@ github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -117,7 +116,6 @@ github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacM github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -315,7 +313,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -340,8 +337,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k= -github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE= +github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -349,8 +346,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8= -github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= +github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI= +github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= @@ -639,7 +636,6 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= @@ -648,12 +644,10 @@ github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQg github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= @@ -662,7 +656,6 @@ github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= @@ -812,6 +805,7 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k= @@ -853,10 +847,10 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -893,10 +887,12 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0 h1:UG21uOlmZabA4fW5i7ZX6bjw1xELEGg/ZLgZq9auk/Q= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -947,12 +943,14 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -983,6 +981,12 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1061,15 +1065,23 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210915083310-ed5796bab164/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8= golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1078,10 +1090,12 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1102,7 +1116,6 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -1188,14 +1201,15 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -1339,7 +1353,6 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/infrastructure/containerd/content.go b/infrastructure/containerd/content.go index 918f6474..93e76ca0 100644 --- a/infrastructure/containerd/content.go +++ b/infrastructure/containerd/content.go @@ -3,8 +3,8 @@ package containerd import ( "fmt" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" ) const ( diff --git a/infrastructure/containerd/convert.go b/infrastructure/containerd/convert.go index 7548da78..1053f3bb 100644 --- a/infrastructure/containerd/convert.go +++ b/infrastructure/containerd/convert.go @@ -6,8 +6,8 @@ import ( "github.com/containerd/containerd/events" "github.com/containerd/containerd/mount" "github.com/containerd/typeurl/v2" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" ) func convertMountToModel(mountPoint mount.Mount, snapshotter string) (models.Mount, error) { diff --git a/infrastructure/containerd/event_service.go b/infrastructure/containerd/event_service.go index a0e1428b..d838ff28 100644 --- a/infrastructure/containerd/event_service.go +++ b/infrastructure/containerd/event_service.go @@ -8,7 +8,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/events" "github.com/containerd/containerd/namespaces" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/ports" ) func NewEventService(cfg *Config) (ports.EventService, error) { diff --git a/infrastructure/containerd/event_service_test.go b/infrastructure/containerd/event_service_test.go index 7e4d6a24..36ca26e6 100644 --- a/infrastructure/containerd/event_service_test.go +++ b/infrastructure/containerd/event_service_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/api/events" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" + "github.com/liquidmetal-dev/flintlock/api/events" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/containerd" ) const ( diff --git a/infrastructure/containerd/image_service.go b/infrastructure/containerd/image_service.go index b39c4483..6629cf45 100644 --- a/infrastructure/containerd/image_service.go +++ b/infrastructure/containerd/image_service.go @@ -9,11 +9,11 @@ import ( "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/snapshots" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" "github.com/opencontainers/image-spec/identity" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) // NewImageService will create a new image service based on containerd with the supplied config. diff --git a/infrastructure/containerd/image_service_integration_test.go b/infrastructure/containerd/image_service_integration_test.go index 510fe395..b4c206e0 100644 --- a/infrastructure/containerd/image_service_integration_test.go +++ b/infrastructure/containerd/image_service_integration_test.go @@ -11,9 +11,9 @@ import ( "github.com/containerd/containerd/snapshots" . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/containerd" ) const ( diff --git a/infrastructure/containerd/image_service_test.go b/infrastructure/containerd/image_service_test.go index 96f1bf6e..13f9fa23 100644 --- a/infrastructure/containerd/image_service_test.go +++ b/infrastructure/containerd/image_service_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/golang/mock/gomock" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/containerd" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" g "github.com/onsi/gomega" "github.com/opencontainers/go-digest" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" ) const ( diff --git a/infrastructure/containerd/repo.go b/infrastructure/containerd/repo.go index 9a3a5b30..04425a58 100644 --- a/infrastructure/containerd/repo.go +++ b/infrastructure/containerd/repo.go @@ -12,12 +12,12 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/namespaces" "github.com/google/go-cmp/cmp" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" "github.com/opencontainers/go-digest" v1 "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) // NewMicroVMRepo will create a new containerd backed microvm repository with the supplied containerd configuration. diff --git a/infrastructure/containerd/repo_test.go b/infrastructure/containerd/repo_test.go index 7074a719..80b59404 100644 --- a/infrastructure/containerd/repo_test.go +++ b/infrastructure/containerd/repo_test.go @@ -7,9 +7,9 @@ import ( ctr "github.com/containerd/containerd" . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/containerd" ) const ctrdRepoNS = "flintlock_test_ctr_repo" diff --git a/infrastructure/controllers/microvm_controller.go b/infrastructure/controllers/microvm_controller.go index 6ab8c84f..c73461ae 100644 --- a/infrastructure/controllers/microvm_controller.go +++ b/infrastructure/controllers/microvm_controller.go @@ -7,13 +7,13 @@ import ( "sync" "time" + "github.com/liquidmetal-dev/flintlock/api/events" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/queue" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/api/events" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/queue" ) func New(eventSvc ports.EventService, reconcileUC ports.ReconcileMicroVMsUseCase, queryUC ports.MicroVMQueryUseCases) *MicroVMController { @@ -188,7 +188,6 @@ func (r *MicroVMController) resyncSpecs(ctx context.Context, logger *logrus.Entr specs, err := r.queryUC.GetAllMicroVM(ctx, models.ListMicroVMQuery{ "Namespace": "", }) - if err != nil { return fmt.Errorf("getting all microvm specs for resync: %w", err) } diff --git a/infrastructure/controllers/microvm_controller_test.go b/infrastructure/controllers/microvm_controller_test.go index 8a5da0bd..a8435be0 100644 --- a/infrastructure/controllers/microvm_controller_test.go +++ b/infrastructure/controllers/microvm_controller_test.go @@ -12,13 +12,13 @@ import ( "github.com/sirupsen/logrus" lgrtest "github.com/sirupsen/logrus/hooks/test" - "github.com/weaveworks-liquidmetal/flintlock/api/events" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/controllers" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/api/events" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/controllers" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/log" ) var ( diff --git a/infrastructure/godisk/disk_service.go b/infrastructure/godisk/disk_service.go index d2189970..d526b4db 100644 --- a/infrastructure/godisk/disk_service.go +++ b/infrastructure/godisk/disk_service.go @@ -13,7 +13,7 @@ import ( units "github.com/docker/go-units" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/ports" ) const ( diff --git a/infrastructure/godisk/disk_service_test.go b/infrastructure/godisk/disk_service_test.go index d2d06887..6b747f79 100644 --- a/infrastructure/godisk/disk_service_test.go +++ b/infrastructure/godisk/disk_service_test.go @@ -8,7 +8,7 @@ import ( g "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/core/ports" ) func TestDiskCreation(t *testing.T) { @@ -112,7 +112,6 @@ func TestInvalidSize(t *testing.T) { err := svc.Create(ctx, input) g.Expect(err).To(g.HaveOccurred()) - } func testCleanupImage(imagePath string, fs afero.Fs) { diff --git a/infrastructure/grpc/convert.go b/infrastructure/grpc/convert.go index fa28cdd8..aba29152 100644 --- a/infrastructure/grpc/convert.go +++ b/infrastructure/grpc/convert.go @@ -3,11 +3,11 @@ package grpc import ( "fmt" - "github.com/weaveworks-liquidmetal/flintlock/api/types" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/ptr" + "github.com/liquidmetal-dev/flintlock/api/types" + "github.com/liquidmetal-dev/flintlock/client/cloudinit/instance" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/ptr" ) func convertMicroVMToModel(spec *types.MicroVMSpec) (*models.MicroVM, error) { diff --git a/infrastructure/grpc/server.go b/infrastructure/grpc/server.go index 4f303a78..2480aa03 100644 --- a/infrastructure/grpc/server.go +++ b/infrastructure/grpc/server.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - mvmv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks-liquidmetal/flintlock/api/types" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + mvmv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" + "github.com/liquidmetal-dev/flintlock/api/types" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/infrastructure/grpc/server_test.go b/infrastructure/grpc/server_test.go index 4e2ff4df..827441ab 100644 --- a/infrastructure/grpc/server_test.go +++ b/infrastructure/grpc/server_test.go @@ -9,11 +9,11 @@ import ( . "github.com/onsi/gomega" grpcPkg "google.golang.org/grpc" - mvm1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks-liquidmetal/flintlock/api/types" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/grpc" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/mock" + mvm1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" + "github.com/liquidmetal-dev/flintlock/api/types" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/infrastructure/grpc" + "github.com/liquidmetal-dev/flintlock/infrastructure/mock" ) func TestServer_CreateMicroVM(t *testing.T) { diff --git a/infrastructure/microvm/cloudhypervisor/cloudinit.go b/infrastructure/microvm/cloudhypervisor/cloudinit.go index 5c491732..554a3f26 100644 --- a/infrastructure/microvm/cloudhypervisor/cloudinit.go +++ b/infrastructure/microvm/cloudhypervisor/cloudinit.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/shared" + "github.com/liquidmetal-dev/flintlock/client/cloudinit" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/shared" ) const ( diff --git a/infrastructure/microvm/cloudhypervisor/create.go b/infrastructure/microvm/cloudhypervisor/create.go index 264b7135..443d2f5e 100644 --- a/infrastructure/microvm/cloudhypervisor/create.go +++ b/infrastructure/microvm/cloudhypervisor/create.go @@ -11,11 +11,11 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/afero" - cerrors "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/process" + cerrors "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/process" ) // Create will create a new microvm. diff --git a/infrastructure/microvm/cloudhypervisor/delete.go b/infrastructure/microvm/cloudhypervisor/delete.go index fe615418..c7c04920 100644 --- a/infrastructure/microvm/cloudhypervisor/delete.go +++ b/infrastructure/microvm/cloudhypervisor/delete.go @@ -7,13 +7,13 @@ import ( "syscall" "time" - "github.com/weaveworks-liquidmetal/flintlock/pkg/cloudhypervisor" - "github.com/weaveworks-liquidmetal/flintlock/pkg/wait" + "github.com/liquidmetal-dev/flintlock/pkg/cloudhypervisor" + "github.com/liquidmetal-dev/flintlock/pkg/wait" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/process" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/process" ) const ( diff --git a/infrastructure/microvm/cloudhypervisor/metrics.go b/infrastructure/microvm/cloudhypervisor/metrics.go index 953a775b..aa3b6016 100644 --- a/infrastructure/microvm/cloudhypervisor/metrics.go +++ b/infrastructure/microvm/cloudhypervisor/metrics.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/shared" - "github.com/weaveworks-liquidmetal/flintlock/pkg/cloudhypervisor" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/shared" + "github.com/liquidmetal-dev/flintlock/pkg/cloudhypervisor" ) // Metrics returns with the metrics of a microvm. diff --git a/infrastructure/microvm/cloudhypervisor/provider.go b/infrastructure/microvm/cloudhypervisor/provider.go index 6a9abb09..e602cdf8 100644 --- a/infrastructure/microvm/cloudhypervisor/provider.go +++ b/infrastructure/microvm/cloudhypervisor/provider.go @@ -5,17 +5,17 @@ import ( "fmt" "time" - "github.com/weaveworks-liquidmetal/flintlock/pkg/cloudhypervisor" + "github.com/liquidmetal-dev/flintlock/pkg/cloudhypervisor" "github.com/sirupsen/logrus" "github.com/spf13/afero" - cerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/process" + cerrs "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/process" ) const ( @@ -118,7 +118,7 @@ func (p *provider) State(ctx context.Context, id string) (ports.MicroVMState, er return ports.MicroVMStateUnknown, fmt.Errorf("querying cloud-hypervisor for info: %w", err) } - //NOTE: we can support paused/unpause in the future + // NOTE: we can support paused/unpause in the future switch vmInfo.State { case cloudhypervisor.VmStateRunning: return ports.MicroVMStateRunning, nil diff --git a/infrastructure/microvm/cloudhypervisor/state.go b/infrastructure/microvm/cloudhypervisor/state.go index f3df2164..43f8b967 100644 --- a/infrastructure/microvm/cloudhypervisor/state.go +++ b/infrastructure/microvm/cloudhypervisor/state.go @@ -3,9 +3,9 @@ package cloudhypervisor import ( "fmt" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/shared" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/shared" ) const ( diff --git a/infrastructure/microvm/firecracker/config.go b/infrastructure/microvm/firecracker/config.go index b4b0102e..4c909446 100644 --- a/infrastructure/microvm/firecracker/config.go +++ b/infrastructure/microvm/firecracker/config.go @@ -4,10 +4,10 @@ import ( "fmt" "runtime" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/shared" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/shared" + "github.com/liquidmetal-dev/flintlock/internal/config" ) const ( @@ -132,18 +132,25 @@ func WithMicroVM(vm *models.MicroVM) ConfigOption { // console=ttyS0 [KLN] Output console device and options // reboot=k [KNL] reboot_type=kbd // panic=1 [KNL] Kernel behaviour on panic: delay -// timeout > 0: seconds before rebooting -// timeout = 0: wait forever -// timeout < 0: reboot immediately +// +// timeout > 0: seconds before rebooting +// timeout = 0: wait forever +// timeout < 0: reboot immediately +// // pci=off [X86] don't probe for the PCI bus // i8042.noaux [HW] Don't check for auxiliary (== mouse) port // i8042.nomux [HW] Don't check presence of an active multiplexing -// controller +// +// controller +// // i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX -// controllers +// +// controllers +// // i8042.dumbkbd [HW] Pretend that controller can only read data from -// keyboard and cannot control its state -// (Don't attempt to blink the leds) +// +// keyboard and cannot control its state +// (Don't attempt to blink the leds) // // Read more: // https://www.kernel.org/doc/html/v5.15/admin-guide/kernel-parameters.html diff --git a/infrastructure/microvm/firecracker/create.go b/infrastructure/microvm/firecracker/create.go index 3532ad3e..2b385a6f 100644 --- a/infrastructure/microvm/firecracker/create.go +++ b/infrastructure/microvm/firecracker/create.go @@ -8,12 +8,12 @@ import ( "os/exec" "github.com/firecracker-microvm/firecracker-go-sdk" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/process" "github.com/sirupsen/logrus" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/process" ) // Create will create a new microvm. diff --git a/infrastructure/microvm/firecracker/provider.go b/infrastructure/microvm/firecracker/provider.go index 01ac5c9e..b2e3b898 100644 --- a/infrastructure/microvm/firecracker/provider.go +++ b/infrastructure/microvm/firecracker/provider.go @@ -8,14 +8,14 @@ import ( "syscall" "time" + cerrs "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/shared" + "github.com/liquidmetal-dev/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/process" "github.com/sirupsen/logrus" "github.com/spf13/afero" - cerrs "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/shared" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" - "github.com/weaveworks-liquidmetal/flintlock/pkg/process" tailor "github.com/yitsushi/file-tailor" ) diff --git a/infrastructure/microvm/firecracker/state.go b/infrastructure/microvm/firecracker/state.go index 05d84ef9..4100056c 100644 --- a/infrastructure/microvm/firecracker/state.go +++ b/infrastructure/microvm/firecracker/state.go @@ -7,10 +7,10 @@ import ( "io/ioutil" "os" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/shared" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/shared" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) type State interface { diff --git a/infrastructure/microvm/firecracker/types_test.go b/infrastructure/microvm/firecracker/types_test.go index 8d7b768f..6329b8c6 100644 --- a/infrastructure/microvm/firecracker/types_test.go +++ b/infrastructure/microvm/firecracker/types_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/firecracker" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/firecracker" ) func TestUnmarshallWithFCSample(t *testing.T) { diff --git a/infrastructure/microvm/providers.go b/infrastructure/microvm/providers.go index dbe13b57..88aacc44 100644 --- a/infrastructure/microvm/providers.go +++ b/infrastructure/microvm/providers.go @@ -6,15 +6,13 @@ import ( "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/cloudhypervisor" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/firecracker" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/cloudhypervisor" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/firecracker" + "github.com/liquidmetal-dev/flintlock/internal/config" ) -var ( - errUnknownProvider = errors.New("unknown provider") -) +var errUnknownProvider = errors.New("unknown provider") // New will create a new instance of a microvm service from the supplied name. func New(name string, cfg *config.Config, networkSvc ports.NetworkService, diskSvc ports.DiskService, fs afero.Fs) (ports.MicroVMService, error) { diff --git a/infrastructure/microvm/shared/network.go b/infrastructure/microvm/shared/network.go index 31e3ec76..05779b81 100644 --- a/infrastructure/microvm/shared/network.go +++ b/infrastructure/microvm/shared/network.go @@ -7,9 +7,9 @@ import ( "github.com/firecracker-microvm/firecracker-go-sdk" "gopkg.in/yaml.v2" - "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/network" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/client/cloudinit/network" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" ) const ( diff --git a/infrastructure/microvm/shared/pid.go b/infrastructure/microvm/shared/pid.go index 491eec38..23019dec 100644 --- a/infrastructure/microvm/shared/pid.go +++ b/infrastructure/microvm/shared/pid.go @@ -7,8 +7,8 @@ import ( "os" "strconv" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) func PIDReadFromFile(pidFile string, fs afero.Fs) (int, error) { diff --git a/infrastructure/mock/containerd.go b/infrastructure/mock/containerd.go index 48e13ee9..8ff9f347 100644 --- a/infrastructure/mock/containerd.go +++ b/infrastructure/mock/containerd.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd (interfaces: Client) +// Source: github.com/liquidmetal-dev/flintlock/infrastructure/containerd (interfaces: Client) // Package mock is a generated GoMock package. package mock diff --git a/infrastructure/mock/gen.go b/infrastructure/mock/gen.go index d21b69f2..58841d6c 100644 --- a/infrastructure/mock/gen.go +++ b/infrastructure/mock/gen.go @@ -1,7 +1,7 @@ package mock -//go:generate ../../hack/tools/bin/mockgen -destination ports.go -package mock github.com/weaveworks-liquidmetal/flintlock/core/ports MicroVMService,MicroVMRepository,EventService,IDService,ImageService,ReconcileMicroVMsUseCase,NetworkService,MicroVMCommandUseCases,MicroVMQueryUseCases -//go:generate ../../hack/tools/bin/mockgen -destination containerd.go -package mock github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd Client +//go:generate ../../hack/tools/bin/mockgen -destination ports.go -package mock github.com/liquidmetal-dev/flintlock/core/ports MicroVMService,MicroVMRepository,EventService,IDService,ImageService,ReconcileMicroVMsUseCase,NetworkService,MicroVMCommandUseCases,MicroVMQueryUseCases +//go:generate ../../hack/tools/bin/mockgen -destination containerd.go -package mock github.com/liquidmetal-dev/flintlock/infrastructure/containerd Client //go:generate ../../hack/tools/bin/mockgen -destination ext_containerd_leases.go -package mock github.com/containerd/containerd/leases Manager //go:generate ../../hack/tools/bin/mockgen -destination ext_containerd_snapshots.go -package mock github.com/containerd/containerd/snapshots Snapshotter //go:generate ../../hack/tools/bin/mockgen -destination ext_containerd.go -package mock github.com/containerd/containerd Image diff --git a/infrastructure/mock/ports.go b/infrastructure/mock/ports.go index 1a06be9f..07036e28 100644 --- a/infrastructure/mock/ports.go +++ b/infrastructure/mock/ports.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/weaveworks-liquidmetal/flintlock/core/ports (interfaces: MicroVMService,MicroVMRepository,EventService,IDService,ImageService,ReconcileMicroVMsUseCase,NetworkService,MicroVMCommandUseCases,MicroVMQueryUseCases) +// Source: github.com/liquidmetal-dev/flintlock/core/ports (interfaces: MicroVMService,MicroVMRepository,EventService,IDService,ImageService,ReconcileMicroVMsUseCase,NetworkService,MicroVMCommandUseCases,MicroVMQueryUseCases) // Package mock is a generated GoMock package. package mock @@ -9,8 +9,8 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - models "github.com/weaveworks-liquidmetal/flintlock/core/models" - ports "github.com/weaveworks-liquidmetal/flintlock/core/ports" + models "github.com/liquidmetal-dev/flintlock/core/models" + ports "github.com/liquidmetal-dev/flintlock/core/ports" ) // MockMicroVMService is a mock of MicroVMService interface. diff --git a/infrastructure/network/network_service.go b/infrastructure/network/network_service.go index 759751c9..16a37ebf 100644 --- a/infrastructure/network/network_service.go +++ b/infrastructure/network/network_service.go @@ -7,12 +7,12 @@ import ( "net" "strings" + "github.com/liquidmetal-dev/flintlock/core/errors" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/pkg/log" "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/weaveworks-liquidmetal/flintlock/core/errors" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) type Config struct { diff --git a/infrastructure/network/utils.go b/infrastructure/network/utils.go index ef01453c..142a3c10 100644 --- a/infrastructure/network/utils.go +++ b/infrastructure/network/utils.go @@ -7,8 +7,8 @@ import ( "io" "strings" + "github.com/liquidmetal-dev/flintlock/core/models" "github.com/vishvananda/netlink" - "github.com/weaveworks-liquidmetal/flintlock/core/models" ) const ( diff --git a/infrastructure/network/utils_test.go b/infrastructure/network/utils_test.go index b8a24e45..4ba6207b 100644 --- a/infrastructure/network/utils_test.go +++ b/infrastructure/network/utils_test.go @@ -5,8 +5,8 @@ import ( g "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/network" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/infrastructure/network" ) const fancyNewIfaceType models.IfaceType = "rainbow" diff --git a/infrastructure/ulid/ulid.go b/infrastructure/ulid/ulid.go index a9490a27..4019ea05 100644 --- a/infrastructure/ulid/ulid.go +++ b/infrastructure/ulid/ulid.go @@ -5,8 +5,8 @@ import ( "math/rand" "time" + "github.com/liquidmetal-dev/flintlock/core/ports" "github.com/oklog/ulid" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" ) func randomSource() *rand.Rand { diff --git a/internal/command/flags/flags.go b/internal/command/flags/flags.go index 871ab20a..a1ac1cb8 100644 --- a/internal/command/flags/flags.go +++ b/internal/command/flags/flags.go @@ -3,10 +3,10 @@ package flags import ( "fmt" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm/firecracker" + "github.com/liquidmetal-dev/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" "github.com/spf13/cobra" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm/firecracker" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) const ( @@ -155,7 +155,6 @@ func AddHiddenFlagsToCommand(cmd *cobra.Command, cfg *config.Config) error { // AddMicrovmProviderFlagsToCommand will add the microvm provider flags to the supplied command func AddMicrovmProviderFlagsToCommand(cmd *cobra.Command, cfg *config.Config) { - addFirecrackerFlagsToCommand(cmd, cfg) addCloudHypervisorFlagsToCommand(cmd, cfg) diff --git a/internal/command/flags/urfave.go b/internal/command/flags/urfave.go index e6999079..5157d89f 100644 --- a/internal/command/flags/urfave.go +++ b/internal/command/flags/urfave.go @@ -1,9 +1,9 @@ package flags import ( + "github.com/liquidmetal-dev/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" "github.com/urfave/cli/v2" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" ) type WithFlagsFunc func() []cli.Flag diff --git a/internal/command/metrics/serve.go b/internal/command/metrics/serve.go index 6299cd89..e9003e54 100644 --- a/internal/command/metrics/serve.go +++ b/internal/command/metrics/serve.go @@ -6,13 +6,13 @@ import ( "net/http" "github.com/gorilla/mux" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/internal/command/flags" + "github.com/liquidmetal-dev/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/internal/inject" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/internal/command/flags" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" - "github.com/weaveworks-liquidmetal/flintlock/internal/inject" ) type serveFunc func(http.ResponseWriter, *http.Request) diff --git a/internal/command/root.go b/internal/command/root.go index 1e0f4941..85ca76c5 100644 --- a/internal/command/root.go +++ b/internal/command/root.go @@ -7,12 +7,12 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/weaveworks-liquidmetal/flintlock/internal/command/run" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" - "github.com/weaveworks-liquidmetal/flintlock/internal/version" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" - "github.com/weaveworks-liquidmetal/flintlock/pkg/flags" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/internal/command/run" + "github.com/liquidmetal-dev/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/internal/version" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/pkg/flags" + "github.com/liquidmetal-dev/flintlock/pkg/log" ) func NewRootCommand() (*cobra.Command, error) { diff --git a/internal/command/run/run.go b/internal/command/run/run.go index 11797b88..6b458486 100644 --- a/internal/command/run/run.go +++ b/internal/command/run/run.go @@ -17,17 +17,17 @@ import ( grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + mvmv1 "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm" + cmdflags "github.com/liquidmetal-dev/flintlock/internal/command/flags" + "github.com/liquidmetal-dev/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/internal/inject" + "github.com/liquidmetal-dev/flintlock/internal/version" + "github.com/liquidmetal-dev/flintlock/pkg/auth" + "github.com/liquidmetal-dev/flintlock/pkg/flags" + "github.com/liquidmetal-dev/flintlock/pkg/log" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/cobra" - mvmv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm" - cmdflags "github.com/weaveworks-liquidmetal/flintlock/internal/command/flags" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" - "github.com/weaveworks-liquidmetal/flintlock/internal/inject" - "github.com/weaveworks-liquidmetal/flintlock/internal/version" - "github.com/weaveworks-liquidmetal/flintlock/pkg/auth" - "github.com/weaveworks-liquidmetal/flintlock/pkg/flags" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/reflection" diff --git a/internal/config/config.go b/internal/config/config.go index 9dcb88e8..5d281b3d 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/log" ) // Config represents the flintlockd configuration. diff --git a/internal/config/validation_test.go b/internal/config/validation_test.go index 3e11d1fb..f1b41d87 100644 --- a/internal/config/validation_test.go +++ b/internal/config/validation_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" + "github.com/liquidmetal-dev/flintlock/internal/config" . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" ) func TestValidateTLSConfig(t *testing.T) { diff --git a/internal/inject/wire.go b/internal/inject/wire.go index 854cbe22..8b28bb79 100644 --- a/internal/inject/wire.go +++ b/internal/inject/wire.go @@ -9,17 +9,17 @@ import ( "github.com/google/wire" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/application" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/controllers" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/godisk" - microvmgrpc "github.com/weaveworks-liquidmetal/flintlock/infrastructure/grpc" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/network" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/ulid" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" + "github.com/liquidmetal-dev/flintlock/core/application" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/containerd" + "github.com/liquidmetal-dev/flintlock/infrastructure/controllers" + "github.com/liquidmetal-dev/flintlock/infrastructure/godisk" + microvmgrpc "github.com/liquidmetal-dev/flintlock/infrastructure/grpc" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm" + "github.com/liquidmetal-dev/flintlock/infrastructure/network" + "github.com/liquidmetal-dev/flintlock/infrastructure/ulid" + "github.com/liquidmetal-dev/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" ) func InitializePorts(cfg *config.Config) (*ports.Collection, error) { diff --git a/internal/inject/wire_gen.go b/internal/inject/wire_gen.go index 3b8194e9..1395b718 100644 --- a/internal/inject/wire_gen.go +++ b/internal/inject/wire_gen.go @@ -1,24 +1,24 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject package inject import ( + "github.com/liquidmetal-dev/flintlock/core/application" + "github.com/liquidmetal-dev/flintlock/core/ports" + "github.com/liquidmetal-dev/flintlock/infrastructure/containerd" + "github.com/liquidmetal-dev/flintlock/infrastructure/controllers" + "github.com/liquidmetal-dev/flintlock/infrastructure/godisk" + "github.com/liquidmetal-dev/flintlock/infrastructure/grpc" + "github.com/liquidmetal-dev/flintlock/infrastructure/microvm" + "github.com/liquidmetal-dev/flintlock/infrastructure/network" + "github.com/liquidmetal-dev/flintlock/infrastructure/ulid" + "github.com/liquidmetal-dev/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/pkg/defaults" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/core/application" - "github.com/weaveworks-liquidmetal/flintlock/core/ports" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/containerd" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/controllers" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/godisk" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/grpc" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/microvm" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/network" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/ulid" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" - "github.com/weaveworks-liquidmetal/flintlock/pkg/defaults" "time" ) diff --git a/pkg/auth/basic_test.go b/pkg/auth/basic_test.go index b22d9101..3e6ea200 100644 --- a/pkg/auth/basic_test.go +++ b/pkg/auth/basic_test.go @@ -5,8 +5,8 @@ import ( "encoding/base64" "testing" + "github.com/liquidmetal-dev/flintlock/pkg/auth" . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/pkg/auth" "google.golang.org/grpc/metadata" ) diff --git a/pkg/auth/tls.go b/pkg/auth/tls.go index 4d2e2057..10af017e 100644 --- a/pkg/auth/tls.go +++ b/pkg/auth/tls.go @@ -6,7 +6,7 @@ import ( "fmt" "io/ioutil" - "github.com/weaveworks-liquidmetal/flintlock/internal/config" + "github.com/liquidmetal-dev/flintlock/internal/config" "google.golang.org/grpc/credentials" ) diff --git a/pkg/log/log_test.go b/pkg/log/log_test.go index 98aa7065..de3bbcdd 100644 --- a/pkg/log/log_test.go +++ b/pkg/log/log_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/gomega" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" + "github.com/liquidmetal-dev/flintlock/pkg/log" ) func TestLogger_Configure(t *testing.T) { diff --git a/pkg/planner/actuator.go b/pkg/planner/actuator.go index ed3c8d03..e01739f7 100644 --- a/pkg/planner/actuator.go +++ b/pkg/planner/actuator.go @@ -5,8 +5,8 @@ import ( "fmt" "time" + "github.com/liquidmetal-dev/flintlock/pkg/log" "github.com/sirupsen/logrus" - "github.com/weaveworks-liquidmetal/flintlock/pkg/log" ) // Actuator will execute the given plan. diff --git a/pkg/planner/actuator_test.go b/pkg/planner/actuator_test.go index 2e8ba804..1d99b499 100644 --- a/pkg/planner/actuator_test.go +++ b/pkg/planner/actuator_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" - "github.com/weaveworks-liquidmetal/flintlock/infrastructure/ulid" - "github.com/weaveworks-liquidmetal/flintlock/pkg/planner" + "github.com/liquidmetal-dev/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/infrastructure/ulid" + "github.com/liquidmetal-dev/flintlock/pkg/planner" ) func TestActuator_SingleProc(t *testing.T) { diff --git a/pkg/planner/planner.go b/pkg/planner/planner.go index 50506893..2683451a 100644 --- a/pkg/planner/planner.go +++ b/pkg/planner/planner.go @@ -3,7 +3,7 @@ package planner import ( "context" - "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/models" ) // NOTE: this is based on this prior work https://gianarb.it/blog/reactive-plan-golang-example diff --git a/pkg/process/process_test.go b/pkg/process/process_test.go index 027b4e28..714c565b 100644 --- a/pkg/process/process_test.go +++ b/pkg/process/process_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + "github.com/liquidmetal-dev/flintlock/pkg/process" g "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/pkg/process" ) func TestSendSignal(t *testing.T) { diff --git a/pkg/queue/queue_test.go b/pkg/queue/queue_test.go index 86fb9a5a..356a19ca 100644 --- a/pkg/queue/queue_test.go +++ b/pkg/queue/queue_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/weaveworks-liquidmetal/flintlock/pkg/queue" + "github.com/liquidmetal-dev/flintlock/pkg/queue" ) func TestSimpleSyncQueue_Basic(t *testing.T) { diff --git a/pkg/validation/validate.go b/pkg/validation/validate.go index 7ca9fdbf..604f578f 100644 --- a/pkg/validation/validate.go +++ b/pkg/validation/validate.go @@ -7,7 +7,7 @@ import ( "github.com/containerd/containerd/reference" playgroundValidator "github.com/go-playground/validator/v10" - "github.com/weaveworks-liquidmetal/flintlock/core/models" + "github.com/liquidmetal-dev/flintlock/core/models" ) type Validator interface { diff --git a/pkg/validation/validate_test.go b/pkg/validation/validate_test.go index 570905b9..602104f9 100644 --- a/pkg/validation/validate_test.go +++ b/pkg/validation/validate_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/go-playground/validator/v10" + "github.com/liquidmetal-dev/flintlock/core/models" . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/core/models" ) func TestValidation_Valid(t *testing.T) { diff --git a/pkg/wait/wait_test.go b/pkg/wait/wait_test.go index 0bcec138..2d6b5953 100644 --- a/pkg/wait/wait_test.go +++ b/pkg/wait/wait_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/weaveworks-liquidmetal/flintlock/pkg/wait" + "github.com/liquidmetal-dev/flintlock/pkg/wait" ) func TestConditionMet(t *testing.T) { diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 23e6f1d0..73fbf3fd 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -8,10 +8,10 @@ import ( "log" "testing" + "github.com/liquidmetal-dev/flintlock/api/types" + "github.com/liquidmetal-dev/flintlock/pkg/ptr" + u "github.com/liquidmetal-dev/flintlock/test/e2e/utils" . "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/api/types" - "github.com/weaveworks-liquidmetal/flintlock/pkg/ptr" - u "github.com/weaveworks-liquidmetal/flintlock/test/e2e/utils" ) var params *u.Params diff --git a/test/e2e/utils/runner.go b/test/e2e/utils/runner.go index 9f0c3a56..31b80e97 100644 --- a/test/e2e/utils/runner.go +++ b/test/e2e/utils/runner.go @@ -19,12 +19,12 @@ import ( "github.com/pelletier/go-toml" "google.golang.org/grpc" - "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" ) const ( containerdBin = "containerd" - flintlockCmdDir = "github.com/weaveworks-liquidmetal/flintlock/cmd/flintlockd" + flintlockCmdDir = "github.com/liquidmetal-dev/flintlock/cmd/flintlockd" containerdCfgDir = "/etc/containerd" containerdRootDir = "/var/lib/containerd-e2e" containerdStateDir = "/run/containerd-e2e" diff --git a/test/e2e/utils/utils.go b/test/e2e/utils/utils.go index 6f631c2a..1577f43b 100644 --- a/test/e2e/utils/utils.go +++ b/test/e2e/utils/utils.go @@ -11,8 +11,8 @@ import ( g "github.com/onsi/gomega" - "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" - "github.com/weaveworks-liquidmetal/flintlock/api/types" + "github.com/liquidmetal-dev/flintlock/api/services/microvm/v1alpha1" + "github.com/liquidmetal-dev/flintlock/api/types" ) func CreateMVM(client v1alpha1.MicroVMClient, name, ns string) *v1alpha1.CreateMicroVMResponse { @@ -79,8 +79,8 @@ func PidRunning(pid int) bool { func defaultTestMicroVM(name, namespace string) *types.MicroVMSpec { var ( - binImage = "ghcr.io/weaveworks-liquidmetal/flintlock-kernel:5.10.77" - osImage = "ghcr.io/weaveworks-liquidmetal/capmvm-k8s-os:1.23.5" + binImage = "ghcr.io/liquidmetal-dev/flintlock-kernel:5.10.77" + osImage = "ghcr.io/liquidmetal-dev/capmvm-k8s-os:1.23.5" ) return &types.MicroVMSpec{ diff --git a/test/tools/config/config.py b/test/tools/config/config.py index fcba6d9d..cac2b6c4 100644 --- a/test/tools/config/config.py +++ b/test/tools/config/config.py @@ -130,7 +130,7 @@ def configure_device(self): def default_repo_config(self): return { - 'username': 'weaveworks', + 'username': 'liquidmetal-dev', 'branch': 'main' } diff --git a/test/tools/config/userdata.sh b/test/tools/config/userdata.sh index 631d227a..698145b3 100644 --- a/test/tools/config/userdata.sh +++ b/test/tools/config/userdata.sh @@ -38,7 +38,7 @@ mv /usr/local/go/bin/go /usr/local/bin mkdir -p /root/work && cd /root/work if [[ -z $FL_USER ]]; then - FL_USER=weaveworks + FL_USER=liquidmetal-dev fi if [[ -z "$FL_BRANCH" ]]; then @@ -64,11 +64,11 @@ fi curl -sL https://github.com/containerd/containerd/releases/download/v1.6.6/containerd-1.6.6-linux-amd64.tar.gz | tar xz -C "$INSTALL_ROOT" && containerd --version && ctr --version # install grpcurl -go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest && \ +go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest && grpcurl --version # install hammertime -go install github.com/warehouse-13/hammertime/releases@latest && \ +go install github.com/warehouse-13/hammertime/releases@latest && hammertime touch /flintlock_ready diff --git a/test/tools/example-config.yaml b/test/tools/example-config.yaml index 14beb1b8..c07bfae0 100644 --- a/test/tools/example-config.yaml +++ b/test/tools/example-config.yaml @@ -3,7 +3,7 @@ org_id: "test-org" # required project_name: "test-project" # or project ID project_id: "abcdef123456" # or project ID repo: - username: "weaveworks" # username of flinklock repo to clone on device + username: "liquidmetal-dev" # username of flinklock repo to clone on device branch: "main" # clone flintlock at this branch test: skip_delete: false # skip the test cleanup and process teardown steps @@ -35,9 +35,9 @@ device: # minimum of 1 must be supplied # note: ensure that the specified plan is availble in each facility facility: - - "fr2" - - "fra2" - - "am6" - - "ams1" + - "fr2" + - "fra2" + - "am6" + - "ams1" operating_system: "ubuntu_20_04" billing_cycle: "hourly" diff --git a/userdocs/docs/getting-started/firecracker.md b/userdocs/docs/getting-started/firecracker.md index 7af3cee1..f7b29faf 100644 --- a/userdocs/docs/getting-started/firecracker.md +++ b/userdocs/docs/getting-started/firecracker.md @@ -18,7 +18,7 @@ will run as a `firecracker` process. If you are feeling weird, you can build this yourself, but we don't recommend it: ```bash -git clone https://github.com/weaveworks/firecracker.git +git clone https://github.com/liquidmetal-dev/firecracker.git git fetch origin feature/macvtap git checkout -b feature/macvtap origin/feature/macvtap @@ -31,8 +31,9 @@ toolbox=$(uname -m)-unknown-linux-musl cp build/cargo_target/${toolbox}/debug/{firecracker,jailer} ${TARGET} ``` + ::: -[discussion-107]: https://github.com/weaveworks-liquidmetal/flintlock/discussions/107 -[fc]: https://github.com/weaveworks/firecracker/releases -[compat]: https://github.com/weaveworks-liquidmetal/flintlock#compatibility +[discussion-107]: https://github.com/liquidmetal-dev/flintlock/discussions/107 +[fc]: https://github.com/liquidmetal-dev/firecracker/releases +[compat]: https://github.com/liquidmetal-dev/flintlock#compatibility diff --git a/userdocs/docs/getting-started/flintlock.md b/userdocs/docs/getting-started/flintlock.md index 1f4bff8c..d1535f69 100644 --- a/userdocs/docs/getting-started/flintlock.md +++ b/userdocs/docs/getting-started/flintlock.md @@ -32,6 +32,7 @@ NET_DEVICE= Lastly we start `flintlockd` with the address to our `containerd`, and the `parent-iface` name: + ```bash sudo ./bin/flintlockd run \ --containerd-socket=/run/containerd-dev/containerd.sock \ @@ -46,6 +47,7 @@ gRPC API from your host machine then you need to run `flintlockd` with the ::: You should see it start successfully with similar output: + ``` INFO[0000] flintlockd, version=undefined, built_on=undefined, commit=undefined INFO[0000] flintlockd grpc api server starting @@ -59,4 +61,4 @@ INFO[0000] starting event listener controller=microvm INFO[0000] Starting workersnum_workers1 controller=microvm ``` -[flint]: https://github.com/weaveworks-liquidmetal/flintlock/releases +[flint]: https://github.com/liquidmetal-dev/flintlock/releases diff --git a/userdocs/docs/getting-started/setup.md b/userdocs/docs/getting-started/setup.md index 0ee3378f..83eb829d 100644 --- a/userdocs/docs/getting-started/setup.md +++ b/userdocs/docs/getting-started/setup.md @@ -19,7 +19,7 @@ just testing things out. For production environment instructions, see [this page ## Clone the repo ```bash -git clone https://github.com/weaveworks-liquidmetal/flintlock +git clone https://github.com/liquidmetal-dev/flintlock cd !$ ``` diff --git a/userdocs/docs/getting-started/usage.md b/userdocs/docs/getting-started/usage.md index 40e4509e..18ee71f0 100644 --- a/userdocs/docs/getting-started/usage.md +++ b/userdocs/docs/getting-started/usage.md @@ -62,16 +62,16 @@ All available endpoints will be visible in a nice tree view. To create a MircoVM, select the `CreateMicroVM` endpoint in the left-hand menu. Replace the sample request JSON in the left editor panel with [this -example][payload-example-create]. Click the green `>` in the centre of the +example][payload-example-create]. Click the green `>` in the centre of the screen. The response should come immediately. In the terminal where you started the Flintlock server, you should see in the logs that the MircoVM has started. To delete the MircoVM, select the `DeleteMicroVM` endpoint in the left-hand -menu. Replace the sample request JSON in the left editor panel with [this -example][payload-example-delete]. Take care to ensure the values match those -of the MicroVM you created earlier. Click the green `>` in the centre of the +menu. Replace the sample request JSON in the left editor panel with [this +example][payload-example-delete]. Take care to ensure the values match those +of the MicroVM you created earlier. Click the green `>` in the centre of the screen. The response should come immediately. **Note: there are example payloads for other endpoints, but not all are @@ -79,8 +79,8 @@ implemented at present.** [grpcurl]: https://github.com/fullstorydev/grpcurl [bloomrpc]: https://github.com/uw-labs/bloomrpc -[payload-example-send]: https://github.com/weaveworks-liquidmetal/flintlock/blob/main/hack/scripts/send.sh -[payload-example-create]: https://github.com/weaveworks-liquidmetal/flintlock/blob/main/hack/scripts/payload/CreateMicroVM.json -[payload-example-delete]: https://github.com/weaveworks-liquidmetal/flintlock/blob/main/hack/scripts/payload/DeleteMicroVM.json +[payload-example-send]: https://github.com/liquidmetal-dev/flintlock/blob/main/hack/scripts/send.sh +[payload-example-create]: https://github.com/liquidmetal-dev/flintlock/blob/main/hack/scripts/payload/CreateMicroVM.json +[payload-example-delete]: https://github.com/liquidmetal-dev/flintlock/blob/main/hack/scripts/payload/DeleteMicroVM.json [ht]: https://github.com/warehouse-13/hammertime -[fl]: https://github.com/weaveworks-liquidmetal/fl +[fl]: https://github.com/liquidmetal-dev/fl diff --git a/userdocs/docs/guides/images.md b/userdocs/docs/guides/images.md index a5a0a843..22ee53f1 100644 --- a/userdocs/docs/guides/images.md +++ b/userdocs/docs/guides/images.md @@ -10,18 +10,19 @@ Compatible images are published as part of the [Liquid Metal][lm] project. ## Supported images **Kernel**: -- `ghcr.io/weaveworks-liquidmetal/flintlock-kernel:5.10.77` -- `ghcr.io/weaveworks-liquidmetal/flintlock-kernel:4.19.215` + +- `ghcr.io/liquidmetal-dev/flintlock-kernel:5.10.77` +- `ghcr.io/liquidmetal-dev/flintlock-kernel:4.19.215` **OS**: _The tags here refer to the version of Kubernetes._ _The base OS is Ubuntu `20.04`._ -- `ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes:1.23.5` -- `ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes:1.22.8` -- `ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes:1.22.3` -- `ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes:1.21.8` +- `ghcr.io/liquidmetal-dev/capmvm-kubernetes:1.23.5` +- `ghcr.io/liquidmetal-dev/capmvm-kubernetes:1.22.8` +- `ghcr.io/liquidmetal-dev/capmvm-kubernetes:1.22.3` +- `ghcr.io/liquidmetal-dev/capmvm-kubernetes:1.21.8` ## Experimental images @@ -30,15 +31,16 @@ These images are not guaranteed to work. ::: **Kernel**: -- `ghcr.io/weaveworks-liquidmetal/flintlock-kernel-arm:5.10.77` -- `ghcr.io/weaveworks-liquidmetal/flintlock-kernel-arm:4.19.215` + +- `ghcr.io/liquidmetal-dev/flintlock-kernel-arm:5.10.77` +- `ghcr.io/liquidmetal-dev/flintlock-kernel-arm:4.19.215` **OS**: -- `ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes-arm:1.23.5` -- `ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes-arm:1.22.8` -- `ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes-arm:1.22.3` -- `ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes-arm:1.21.8` +- `ghcr.io/liquidmetal-dev/capmvm-kubernetes-arm:1.23.5` +- `ghcr.io/liquidmetal-dev/capmvm-kubernetes-arm:1.22.8` +- `ghcr.io/liquidmetal-dev/capmvm-kubernetes-arm:1.22.3` +- `ghcr.io/liquidmetal-dev/capmvm-kubernetes-arm:1.21.8` ## Build your own @@ -65,11 +67,11 @@ This downloads the Ubuntu Server Cloud Image files and and processes them. The downloaded files and processed files will be available in `out/images` by default. There are a number of flags that can be used for custimization: -| Flag | Description | -| --------------- | ---------------------------------------------------------------- | -| -o/--output | Specifies the output folder to use. Defaults to `./out`. | -| -v/--version | Specifies the ubuntu version to download. Defaults to `bionic`. | -| -s/--image-size | Specifies the size of the root fs to create. Defaluts to `10G`. | +| Flag | Description | +| --------------- | --------------------------------------------------------------- | +| -o/--output | Specifies the output folder to use. Defaults to `./out`. | +| -v/--version | Specifies the ubuntu version to download. Defaults to `bionic`. | +| -s/--image-size | Specifies the size of the root fs to create. Defaluts to `10G`. | The processed files (i.e. root filesystem, uncompressed kernel, initrd) can be used directly with Firecracker without flintlock. @@ -83,17 +85,17 @@ The commands in the following sections may need to be adapted. 1. Run the following to mount the downloaded and processed root filesystem: - ```shell - mkdir -p out/images/mount - sudo mount -o loop out/images/bionic/bionic.rootfs ./out/images/mount - ``` +```shell +mkdir -p out/images/mount +sudo mount -o loop out/images/bionic/bionic.rootfs ./out/images/mount +``` 1. Run the following to create the container image (replacing `myorg/ubuntu-bionic-volume:v0.0.1` with your required container image name/tag): - ```shell - sudo tar -C ./out/images/mount -c . | docker import - myorg/ubuntu-bionic-volume:v0.0.1 - docker push myorg/ubuntu-bionic-volume:v0.0.1 - ``` +```shell +sudo tar -C ./out/images/mount -c . | docker import - myorg/ubuntu-bionic-volume:v0.0.1 +docker push myorg/ubuntu-bionic-volume:v0.0.1 +``` ### Building a Kernel/Initrd container image @@ -101,15 +103,15 @@ We recommend using [Firecracker's kernel config][fc] if you are building anew. 1. Create a Dockerfile that adds the uncompressed kernel and initrd. For example: - ```dockerfile - FROM scratch +```dockerfile +FROM scratch - COPY vmlinux initrd-generic / - ``` +COPY vmlinux initrd-generic / +``` 1. Use docker build and then push -[image-builder]: https://github.com/weaveworks-liquidmetal/image-builder +[image-builder]: https://github.com/liquidmetal-dev/image-builder [lm]: https://weaveworks-liquidmetal.github.io/site/ [db]: https://wiki.debian.org/Debootstrap [fc]: https://github.com/firecracker-microvm/firecracker/tree/main/resources/guest_configs diff --git a/userdocs/docs/intro.md b/userdocs/docs/intro.md index 466a5835..690ea396 100644 --- a/userdocs/docs/intro.md +++ b/userdocs/docs/intro.md @@ -33,10 +33,9 @@ Using API requests (via [gRPC][proto] or + ) }