From 28fbf443f82cbea30298053d886abccfb3f2e46b Mon Sep 17 00:00:00 2001 From: Richard Case Date: Tue, 10 May 2022 12:06:16 +0100 Subject: [PATCH] chore: updates as a result of the GitHub org move Changes required as a result of this repo moving from the `weaveworks` GitHub org to the `weavework-liquidmetal` org. Most of the changes relate to Go module name changes. Signed-off-by: Richard Case --- .golangci.yml | 6 +++--- Makefile | 4 ++-- PROJECT | 8 ++++---- config/default/manager_image_patch.yaml | 2 +- controllers/helpers_test.go | 14 +++++++------- controllers/microvmcluster_controller.go | 6 +++--- controllers/microvmcluster_controller_test.go | 2 +- controllers/microvmmachine_controller.go | 10 +++++----- controllers/microvmmachine_controller_test.go | 8 ++++---- docs/adr/0003-no-machinepool-support.md | 2 +- docs/development-with-tilt.md | 6 +++--- docs/releasing.md | 6 +++--- go.mod | 6 +++--- go.sum | 4 ++++ hack/scripts/version.sh | 2 +- hack/tools/go.mod | 2 +- hack/version.sh | 2 +- internal/scope/cluster.go | 4 ++-- internal/scope/machine.go | 4 ++-- internal/scope/machine_test.go | 4 ++-- internal/services/microvm/convert.go | 6 +++--- .../services/microvm/mock_client/fake_client.go | 4 ++-- internal/services/microvm/service.go | 14 +++++++------- main.go | 12 ++++++------ templates/cluster-template-cilium.yaml | 8 ++++---- templates/cluster-template.yaml | 8 ++++---- tilt-provider.json | 2 +- 27 files changed, 80 insertions(+), 76 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 3aa6f33..0429d9b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -23,7 +23,7 @@ linters-settings: misspell: locale: GB goimports: - local-prefixes: github.com/weaveworks/cluster-api-provider-microvm + local-prefixes: github.com/weaveworks-liquidmetal/cluster-api-provider-microvm govet: check-shadowing: true nolintlint: @@ -46,10 +46,10 @@ issues: - 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/cluster-api-provider-microvm/" + - text: "local replacement are not allowed: github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/" linters: - gomoddirectives - - text: "github.com/weaveworks/" + - text: "github.com/weaveworks-liquidmetal/" linters: - wrapcheck - source: "https://" diff --git a/Makefile b/Makefile index dca46b6..09a8587 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SHELL = /usr/bin/env bash -o pipefail TAG ?= dev ARCH ?= amd64 REGISTRY ?= ghcr.io -ORG ?= weaveworks +ORG ?= weaveworks-liquidmetal CONTROLLER_IMAGE_NAME := cluster-api-provider-microvm CONTROLLER_IMAGE ?= $(REGISTRY)/$(ORG)/$(CONTROLLER_IMAGE_NAME) @@ -24,7 +24,7 @@ WEBHOOK_ROOT ?= $(MANIFEST_ROOT)/webhook RBAC_ROOT ?= $(MANIFEST_ROOT)/rbac # Set --output-base for conversion-gen if we are not within GOPATH -ifneq ($(abspath $(REPO_ROOT)),$(shell go env GOPATH)/src/github.com/weaveworks/cluster-api-provider-microvm) +ifneq ($(abspath $(REPO_ROOT)),$(shell go env GOPATH)/src/github.com/weaveworks-liquidmetal/cluster-api-provider-microvm) GEN_OUTPUT_BASE := --output-base=$(REPO_ROOT) else export GOPATH := $(shell go env GOPATH) diff --git a/PROJECT b/PROJECT index 9c2d1ac..7f0897d 100644 --- a/PROJECT +++ b/PROJECT @@ -2,7 +2,7 @@ domain: cluster.x-k8s.io layout: - go.kubebuilder.io/v3 projectName: cluster-api-provider-microvm -repo: github.com/weaveworks/cluster-api-provider-microvm +repo: github.com/weaveworks-liquidmetal/cluster-api-provider-microvm resources: - api: crdVersion: v1 @@ -11,7 +11,7 @@ resources: domain: cluster.x-k8s.io group: infrastructure kind: MicrovmCluster - path: github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1 + path: github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -20,7 +20,7 @@ resources: domain: cluster.x-k8s.io group: infrastructure kind: MicrovmMachine - path: github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1 + path: github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -29,6 +29,6 @@ resources: domain: cluster.x-k8s.io group: infrastructure kind: MicrovmMachineTemplate - path: github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1 + path: github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 76dcd21..2ded1c3 100644 --- a/config/default/manager_image_patch.yaml +++ b/config/default/manager_image_patch.yaml @@ -9,5 +9,5 @@ spec: imagePullSecrets: - name: capmvm-private-image-cred containers: - - image: ghcr.io/weaveworks/cluster-api-provider-microvm:dev + - image: ghcr.io/weaveworks-liquidmetal/cluster-api-provider-microvm:dev name: manager diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go index 11f9258..872ef48 100644 --- a/controllers/helpers_test.go +++ b/controllers/helpers_test.go @@ -24,13 +24,13 @@ import ( fakeremote "sigs.k8s.io/cluster-api/controllers/remote/fake" "sigs.k8s.io/cluster-api/util/conditions" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/controllers" - "github.com/weaveworks/cluster-api-provider-microvm/internal/services/microvm" - "github.com/weaveworks/cluster-api-provider-microvm/internal/services/microvm/mock_client" - flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - flintlocktypes "github.com/weaveworks/flintlock/api/types" - "github.com/weaveworks/flintlock/client/cloudinit/userdata" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/controllers" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/services/microvm" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/services/microvm/mock_client" + flintlockv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + flintlocktypes "github.com/weaveworks-liquidmetal/flintlock/api/types" + "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/userdata" ) const ( diff --git a/controllers/microvmcluster_controller.go b/controllers/microvmcluster_controller.go index dc9172f..3c8a285 100644 --- a/controllers/microvmcluster_controller.go +++ b/controllers/microvmcluster_controller.go @@ -27,9 +27,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/internal/defaults" - "github.com/weaveworks/cluster-api-provider-microvm/internal/scope" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/defaults" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/scope" ) const ( diff --git a/controllers/microvmcluster_controller_test.go b/controllers/microvmcluster_controller_test.go index c7f0448..07407c9 100644 --- a/controllers/microvmcluster_controller_test.go +++ b/controllers/microvmcluster_controller_test.go @@ -18,7 +18,7 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/util/conditions" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" ) func TestClusterReconciliationNoEndpoint(t *testing.T) { diff --git a/controllers/microvmmachine_controller.go b/controllers/microvmmachine_controller.go index 01fc498..3e954ce 100644 --- a/controllers/microvmmachine_controller.go +++ b/controllers/microvmmachine_controller.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/go-logr/logr" - flintlocktypes "github.com/weaveworks/flintlock/api/types" + flintlocktypes "github.com/weaveworks-liquidmetal/flintlock/api/types" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" @@ -29,10 +29,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/internal/defaults" - "github.com/weaveworks/cluster-api-provider-microvm/internal/scope" - "github.com/weaveworks/cluster-api-provider-microvm/internal/services/microvm" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/defaults" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/scope" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/services/microvm" ) // MicrovmMachineReconciler reconciles a MicrovmMachine object. diff --git a/controllers/microvmmachine_controller_test.go b/controllers/microvmmachine_controller_test.go index 61133e3..59809d4 100644 --- a/controllers/microvmmachine_controller_test.go +++ b/controllers/microvmmachine_controller_test.go @@ -17,11 +17,11 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - flintlocktypes "github.com/weaveworks/flintlock/api/types" + flintlocktypes "github.com/weaveworks-liquidmetal/flintlock/api/types" - "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/internal/services/microvm/mock_client" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/services/microvm/mock_client" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/docs/adr/0003-no-machinepool-support.md b/docs/adr/0003-no-machinepool-support.md index 982fb22..442c50e 100644 --- a/docs/adr/0003-no-machinepool-support.md +++ b/docs/adr/0003-no-machinepool-support.md @@ -15,7 +15,7 @@ Cluster API[^1][^2] supports a number of resources kinds that infrastructure pro ## Decision -Cluster API Provider Microvm (CAPMVM) will not support **Machine Pools** initially as [flintlock](https://github.com/weaveworks/flintlock) has no way concept of auto-scaling or machine pools. +Cluster API Provider Microvm (CAPMVM) will not support **Machine Pools** initially as [flintlock](https://github.com/weaveworks-liquidmetal/flintlock) has no way concept of auto-scaling or machine pools. ## Consequences diff --git a/docs/development-with-tilt.md b/docs/development-with-tilt.md index 7090afa..ae49510 100644 --- a/docs/development-with-tilt.md +++ b/docs/development-with-tilt.md @@ -25,7 +25,7 @@ This guide show how you can use **Tilt** for interactive development/debugging. cd src/github.com/weaveworks git clone git@github.com:/cluster-api-provider-microvm.git cd cluster-api-provider-microvm - git remote add upstream git@github.com:weaveworks/cluster-api-provider-microvm.git + git remote add upstream git@github.com:weaveworks-liquidmetal/cluster-api-provider-microvm.git git fetch upstream ``` @@ -45,7 +45,7 @@ In your cluster-api folder create a file called **tilt-settings.json**: ```json { "default_registry": "gcr.io/yourusername", - "provider_repos": ["../../github.com/weaveworks/cluster-api-provider-microvm"], + "provider_repos": ["../../github.com/weaveworks-liquidmetal/cluster-api-provider-microvm"], "enable_providers": ["microvm", "kubeadm-bootstrap", "kubeadm-control-plane"], "kustomize_substitutions": { "EXP_MACHINE_POOL": "true", @@ -84,7 +84,7 @@ When tilt is started you can press the **spacebar** to open up a browser based U ## Start flintlock -Ensure that you have an instance of flintlock (and containerd) [configured and running](https://github.com/weaveworks/flintlock/blob/main/docs/quick-start.md). +Ensure that you have an instance of flintlock (and containerd) [configured and running](https://github.com/weaveworks-liquidmetal/flintlock/blob/main/docs/quick-start.md). Be sure to start flintlock with `--grpc-endpoint=0.0.0.0:9090` or the CAPMVM controller will not be able to connect to the server from within the Kind cluster. diff --git a/docs/releasing.md b/docs/releasing.md index 54249f2..1f444bf 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -1,6 +1,6 @@ # Releasing CAPMVM -> IMPORTANT - before doing a release that updates the major or minor version make sure you have updated and commited [metadata.yaml](https://github.com/weaveworks/cluster-api-provider-microvm/blob/main/metadata.yaml) with the new version. +> IMPORTANT - before doing a release that updates the major or minor version make sure you have updated and commited [metadata.yaml](https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/blob/main/metadata.yaml) with the new version. ## Determine release version @@ -38,8 +38,8 @@ git tag -s "${RELEASE_VERSION}" -m "${RELEASE_VERSION}" git push origin "${RELEASE_VERSION}" ``` -* Check the [release](https://github.com/weaveworks/cluster-api-provider-microvm/actions/workflows/release.yml) GitHub Actions workflow completes successfully. -* Check that the [docker image](https://github.com/orgs/weaveworks/packages?repo_name=cluster-api-provider-microvm) for that tag was created successfully. (This +* Check the [release](https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/actions/workflows/release.yml) GitHub Actions workflow completes successfully. +* Check that the [docker image](https://github.com/orgs/weaveworks-liquidmetal/packages?repo_name=cluster-api-provider-microvm) for that tag was created successfully. (This won't actually be visible while the repo is private for... reasons.) ## Edit & Publish GitHub Release diff --git a/go.mod b/go.mod index 826d167..396b229 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks/cluster-api-provider-microvm +module github.com/weaveworks-liquidmetal/cluster-api-provider-microvm go 1.17 @@ -6,8 +6,6 @@ require ( github.com/go-logr/logr v0.4.0 github.com/onsi/gomega v1.18.1 github.com/spf13/pflag v1.0.5 - github.com/weaveworks/flintlock/api v0.0.0-20220126090930-054c6c3be154 - github.com/weaveworks/flintlock/client v0.0.0-20220221140503-8032d3ff7d2c github.com/yitsushi/macpot v1.0.2 google.golang.org/grpc v1.44.0 google.golang.org/protobuf v1.27.1 @@ -60,6 +58,8 @@ require ( github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.26.0 // indirect github.com/prometheus/procfs v0.6.0 // indirect + github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220510103109-fab05d0b1346 // indirect + github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220510103109-fab05d0b1346 // indirect golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect diff --git a/go.sum b/go.sum index 84df07a..7b626f7 100644 --- a/go.sum +++ b/go.sum @@ -546,6 +546,10 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220510103109-fab05d0b1346 h1:w/Ld8EgtzXjFQK0fB6pEfptON2DP2LxWB69sGiimkMw= +github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220510103109-fab05d0b1346/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc= +github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220510103109-fab05d0b1346 h1:5CxmOoxgQBfsHE6TXB0DphgYFHosWdqaap3F7sJ2kPQ= +github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220510103109-fab05d0b1346/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI= github.com/weaveworks/flintlock/api v0.0.0-20220126090930-054c6c3be154 h1:ReCeLgnGnHxqW9AKi+WepMxC4h24SD18W4Wz5jAO58U= github.com/weaveworks/flintlock/api v0.0.0-20220126090930-054c6c3be154/go.mod h1:RFgQ7RSa7zGNxxR+dS6NRDCQ/IAN23WCfXg4+L6fclI= github.com/weaveworks/flintlock/client v0.0.0-20220126090930-054c6c3be154 h1:LbMhm60d/6/MkhwXSJaf960JcNK986r5YzC75vNqylc= diff --git a/hack/scripts/version.sh b/hack/scripts/version.sh index 0dc228c..d2e72c3 100755 --- a/hack/scripts/version.sh +++ b/hack/scripts/version.sh @@ -87,7 +87,7 @@ version::ldflags() { local key=${1} local val=${2} ldflags+=( - "-X 'github.com/weaveworks/cluster-api-provider-microvm/version.${key}=${val}'" + "-X 'github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/version.${key}=${val}'" ) } diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 2832a8e..3476d05 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks/cluster-api-provider-microvm/hack/tools +module github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/hack/tools go 1.17 diff --git a/hack/version.sh b/hack/version.sh index 0dc228c..d2e72c3 100755 --- a/hack/version.sh +++ b/hack/version.sh @@ -87,7 +87,7 @@ version::ldflags() { local key=${1} local val=${2} ldflags+=( - "-X 'github.com/weaveworks/cluster-api-provider-microvm/version.${key}=${val}'" + "-X 'github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/version.${key}=${val}'" ) } diff --git a/internal/scope/cluster.go b/internal/scope/cluster.go index 6a25a3d..2c56b3e 100644 --- a/internal/scope/cluster.go +++ b/internal/scope/cluster.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/internal/defaults" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/defaults" ) var _ Scoper = &ClusterScope{} diff --git a/internal/scope/machine.go b/internal/scope/machine.go index d779192..357b125 100644 --- a/internal/scope/machine.go +++ b/internal/scope/machine.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/cluster-api/util/patch" "sigs.k8s.io/controller-runtime/pkg/client" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/internal/defaults" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/defaults" ) var _ Scoper = &MachineScope{} diff --git a/internal/scope/machine_test.go b/internal/scope/machine_test.go index 95877a5..3c76540 100644 --- a/internal/scope/machine_test.go +++ b/internal/scope/machine_test.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/internal/scope" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/scope" ) func TestMachineProviderID(t *testing.T) { diff --git a/internal/services/microvm/convert.go b/internal/services/microvm/convert.go index 21b6ea3..a1bdfe1 100644 --- a/internal/services/microvm/convert.go +++ b/internal/services/microvm/convert.go @@ -4,10 +4,10 @@ package microvm import ( - flintlocktypes "github.com/weaveworks/flintlock/api/types" + flintlocktypes "github.com/weaveworks-liquidmetal/flintlock/api/types" - "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/internal/scope" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/scope" ) const platformLiquidMetal = "liquid_metal" diff --git a/internal/services/microvm/mock_client/fake_client.go b/internal/services/microvm/mock_client/fake_client.go index a275392..13b7a32 100644 --- a/internal/services/microvm/mock_client/fake_client.go +++ b/internal/services/microvm/mock_client/fake_client.go @@ -5,8 +5,8 @@ import ( "context" "sync" - "github.com/weaveworks/cluster-api-provider-microvm/internal/services/microvm" - "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/services/microvm" + "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/internal/services/microvm/service.go b/internal/services/microvm/service.go index a94be8a..0728458 100644 --- a/internal/services/microvm/service.go +++ b/internal/services/microvm/service.go @@ -8,18 +8,18 @@ import ( "encoding/base64" "fmt" - flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - flintlocktypes "github.com/weaveworks/flintlock/api/types" - "github.com/weaveworks/flintlock/client/cloudinit/instance" - "github.com/weaveworks/flintlock/client/cloudinit/userdata" + flintlockv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + flintlocktypes "github.com/weaveworks-liquidmetal/flintlock/api/types" + "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/instance" + "github.com/weaveworks-liquidmetal/flintlock/client/cloudinit/userdata" "github.com/yitsushi/macpot" "google.golang.org/protobuf/types/known/emptypb" "gopkg.in/yaml.v2" "k8s.io/utils/pointer" - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/internal/defaults" - "github.com/weaveworks/cluster-api-provider-microvm/internal/scope" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/defaults" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/scope" ) const ( diff --git a/main.go b/main.go index e5990de..df34e90 100644 --- a/main.go +++ b/main.go @@ -26,8 +26,8 @@ import ( "time" "github.com/spf13/pflag" - flintlockv1 "github.com/weaveworks/flintlock/api/services/microvm/v1alpha1" - flgrpc "github.com/weaveworks/flintlock/client/grpc" + flintlockv1 "github.com/weaveworks-liquidmetal/flintlock/api/services/microvm/v1alpha1" + flgrpc "github.com/weaveworks-liquidmetal/flintlock/client/grpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "k8s.io/apimachinery/pkg/runtime" @@ -44,10 +44,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" //+kubebuilder:scaffold:imports - infrav1 "github.com/weaveworks/cluster-api-provider-microvm/api/v1alpha1" - "github.com/weaveworks/cluster-api-provider-microvm/controllers" - "github.com/weaveworks/cluster-api-provider-microvm/internal/services/microvm" - "github.com/weaveworks/cluster-api-provider-microvm/version" + infrav1 "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/api/v1alpha1" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/controllers" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/internal/services/microvm" + "github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/version" ) //nolint:gochecknoinits // Maybe we can remove it, now just ignore. diff --git a/templates/cluster-template-cilium.yaml b/templates/cluster-template-cilium.yaml index cdd22b9..c960b7c 100644 --- a/templates/cluster-template-cilium.yaml +++ b/templates/cluster-template-cilium.yaml @@ -76,11 +76,11 @@ spec: memoryMb: 2048 rootVolume: id: root - image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:1.21.8}" + image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes:1.21.8}" mountPoint: "/" kernel: filename: "boot/vmlinux" - image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks/flintlock-kernel:5.10.77}" + image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks-liquidmetal/flintlock-kernel:5.10.77}" kernelCmdline: {} networkInterfaces: - guestDeviceName: "eth1" @@ -120,11 +120,11 @@ spec: memoryMb: 2048 rootVolume: id: root - image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:1.21.8}" + image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes:1.21.8}" mountPoint: "/" kernel: filename: "boot/vmlinux" - image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks/flintlock-kernel:5.10.77}" + image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks-liquidmetal/flintlock-kernel:5.10.77}" kernelCmdline: {} networkInterfaces: - guestDeviceName: "eth1" diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index 989fe27..ceeebff 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -72,11 +72,11 @@ spec: memoryMb: 2048 rootVolume: id: root - image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:1.21.8}" + image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes:1.21.8}" mountPoint: "/" kernel: filename: "boot/vmlinux" - image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks/flintlock-kernel:5.10.77}" + image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks-liquidmetal/flintlock-kernel:5.10.77}" kernelCmdline: {} networkInterfaces: - guestDeviceName: "eth1" @@ -116,11 +116,11 @@ spec: memoryMb: 2048 rootVolume: id: root - image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks/capmvm-kubernetes:1.21.8}" + image: "${MVM_ROOT_IMAGE:=ghcr.io/weaveworks-liquidmetal/capmvm-kubernetes:1.21.8}" mountPoint: "/" kernel: filename: "boot/vmlinux" - image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks/flintlock-kernel:5.10.77}" + image: "${MVM_KERNEL_IMAGE:=ghcr.io/weaveworks-liquidmetal/flintlock-kernel:5.10.77}" kernelCmdline: {} networkInterfaces: - guestDeviceName: "eth1" diff --git a/tilt-provider.json b/tilt-provider.json index 84a15da..fe4c69e 100644 --- a/tilt-provider.json +++ b/tilt-provider.json @@ -2,7 +2,7 @@ { "name": "microvm", "config": { - "image": "ghcr.io/weaveworks/cluster-api-provider-microvm:dev", + "image": "ghcr.io/weaveworks-liquidmetal/cluster-api-provider-microvm:dev", "live_reload_deps": [ "main.go", "go.mod",