Skip to content

Commit

Permalink
Merge pull request #167 from weaveworks-liquidmetal/repo_move
Browse files Browse the repository at this point in the history
chore: updates as a result of the GitHub org move
  • Loading branch information
richardcase authored May 10, 2022
2 parents 3de2bf5 + 28fbf44 commit cc00428
Show file tree
Hide file tree
Showing 27 changed files with 80 additions and 76 deletions.
6 changes: 3 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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://"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions controllers/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions controllers/microvmcluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion controllers/microvmcluster_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions controllers/microvmmachine_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions controllers/microvmmachine_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion docs/adr/0003-no-machinepool-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions docs/development-with-tilt.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This guide show how you can use **Tilt** for interactive development/debugging.
cd src/github.com/weaveworks
git clone [email protected]:<GITHUBUSERNAME>/cluster-api-provider-microvm.git
cd cluster-api-provider-microvm
git remote add upstream [email protected]:weaveworks/cluster-api-provider-microvm.git
git remote add upstream [email protected]:weaveworks-liquidmetal/cluster-api-provider-microvm.git
git fetch upstream
```

Expand All @@ -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",
Expand Down Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions docs/releasing.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
module github.com/weaveworks/cluster-api-provider-microvm
module github.com/weaveworks-liquidmetal/cluster-api-provider-microvm

go 1.17

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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion hack/scripts/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}'"
)
}

Expand Down
2 changes: 1 addition & 1 deletion hack/tools/go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion hack/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}'"
)
}

Expand Down
4 changes: 2 additions & 2 deletions internal/scope/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
4 changes: 2 additions & 2 deletions internal/scope/machine.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
4 changes: 2 additions & 2 deletions internal/scope/machine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions internal/services/microvm/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/services/microvm/mock_client/fake_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions internal/services/microvm/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
12 changes: 6 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
Loading

0 comments on commit cc00428

Please sign in to comment.