Merge pull request #316 from liquidmetal-dev/updating-go-and-adding-viritofs

Updating golang and adding viriotfs

Author: richardcase

.github/workflows/lint.yml

@@ -10,6 +10,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.23.1'
       - name: Lint
         run: make lint

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.19'
+          go-version: '1.23.1'
       - name: Build
         run: make build
       - name: Test

.golangci.yml

@@ -24,7 +24,7 @@ linters-settings:
   misspell:
     locale: GB
   goimports:
-    local-prefixes: github.com/weaveworks-liquidmetal/cluster-api-provider-microvm
+    local-prefixes: github.com/liquidmetal-dev/cluster-api-provider-microvm
   govet:
     check-shadowing: true
   nolintlint:
@@ -47,10 +47,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-liquidmetal/cluster-api-provider-microvm/"
+  - text: "local replacement are not allowed: github.com/liquidmetal-dev/cluster-api-provider-microvm/"
     linters:
     - gomoddirectives
-  - text: "github.com/weaveworks-liquidmetal/"
+  - text: "github.com/liquidmetal-dev/"
     linters:
     - wrapcheck
   - source: "https://"

CONTRIBUTING.md

@@ -78,11 +78,11 @@ Here is a non-exhaustive list of ways you can help out:
 
 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/cluster-api-provider-microvm/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug+), [feature requests](https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/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/cluster-api-provider-microvm/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fbug+), [feature requests](https://github.com/liquidmetal-dev/cluster-api-provider-microvm/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/cluster-api-provider-microvm/labels/needs-investigation) or [`help wanted`](https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/labels/help-wanted) :detective:
+1. Dig into some [`needs-investigation`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm/labels/needs-investigation) or [`help wanted`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm/labels/help-wanted) :detective:
 
-1. Get involved in some [PR reviews](https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/pulls). :nerd_face:
+1. Get involved in some [PR reviews](https://github.com/liquidmetal-dev/cluster-api-provider-microvm/pulls). :nerd_face:
 
 # Opening Issues
 
@@ -218,7 +218,7 @@ If you are not here to report a bug, ask for help or request some new behaviour,
 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/cluster-api-provider-microvm/labels/good%20first%20issue)
+- Issues labelled [`good first issue`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm/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,
@@ -234,7 +234,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/cluster-api-provider-microvm/labels/help%20wanted)
+- [`help wanted` issues](https://github.com/liquidmetal-dev/cluster-api-provider-microvm/labels/help%20wanted)
   are for those a little more familiar with the code base, but should still be accessible enough
   to newcomers.
 
@@ -441,7 +441,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:
 
@@ -468,7 +468,7 @@ The core team regularly processes incoming issues. There may be some delay over
 
 Every issue will be assigned a `priority/<x>` label. The levels of priorities are:
 
-- [`critical-urgent`](https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/labels/priority%2Fcritical-urgent): These are time sensitive issues which should be picked up immediately.
+- [`critical-urgent`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm/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
@@ -477,13 +477,13 @@ Every issue will be assigned a `priority/<x>` 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/cluster-api-provider-microvm//labels/priority%2Fimportant-soon): Must be assigned as soon as capacity becomes available.
+- [`important-soon`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm//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/cluster-api-provider-microvm//labels/priority%2Fimportant-longterm): Important over the long term, but may not be currently
+- [`important-longterm`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm//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/cluster-api-provider-microvm//labels/priority%2Fbacklog): There appears to be general agreement that this would be good to have,
+- [`backlog`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm//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.
@@ -492,11 +492,11 @@ These priority categories have been inspired by [the Kubernetes contributing gui
 
 Other labels include:
 
-- [`adr-required`](https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm//labels/adr-required):
+- [`adr-required`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm//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/cluster-api-provider-microvm//labels/needs-investigation):  There is currently insufficient information to either categorize properly,
+- [`needs-investigation`](https://github.com/liquidmetal-dev/cluster-api-provider-microvm//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.
@@ -548,7 +548,7 @@ Contributors are also welcome to backfill ADRs if they are found to be missing.
 # :rocket: :tada: Thanks for reading! :tada: :rocket:
 
 [slack-channel]: https://weave-community.slack.com/archives/C02KARWGR7S
-[discussions]: https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm//discussions
+[discussions]: https://github.com/liquidmetal-dev/cluster-api-provider-microvm//discussions
 [adr-template]: ./docs/adr/0000-template.md
 [developing]: ./docs/development-with-tilt.md
 [e2e]: ./test/e2e

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.23.1 as builder
 
 ARG goproxy=https://proxy.golang.org
 ENV GOPROXY=$goproxy

Makefile

@@ -7,7 +7,7 @@ SHELL = /usr/bin/env bash -o pipefail
 TAG ?= dev
 ARCH ?= amd64
 REGISTRY ?= ghcr.io
-ORG ?= weaveworks-liquidmetal
+ORG ?= liquidmetal-dev
 CONTROLLER_IMAGE_NAME := cluster-api-provider-microvm
 CONTROLLER_IMAGE ?= $(REGISTRY)/$(ORG)/$(CONTROLLER_IMAGE_NAME)
 
@@ -23,12 +23,7 @@ CRD_ROOT ?= $(MANIFEST_ROOT)/crd/bases
 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-liquidmetal/cluster-api-provider-microvm)
-	GEN_OUTPUT_BASE := --output-base=$(REPO_ROOT)
-else
-	export GOPATH := $(shell go env GOPATH)
-endif
+GEN_FILE :=--output-file=zz_generated.defaults.go
 
 # Set build time variables including version details
 LDFLAGS := $(shell source ./hack/scripts/version.sh; version::ldflags)
@@ -127,8 +122,8 @@ generate-go: $(CONTROLLER_GEN) $(DEFAULTER_GEN) $(COUNTERFEITER)
 		object:headerFile="hack/boilerplate.go.txt" 
 
 	$(DEFAULTER_GEN) \
-		--input-dirs=./api/v1alpha1 \
-		--v=0 $(GEN_OUTPUT_BASE) \
+		./api/v1alpha1 \
+		--v=0 $(GEN_FILE) \
 		--go-header-file=./hack/boilerplate.go.txt
 
 	go generate ./...

PROJECT

@@ -2,7 +2,7 @@ domain: cluster.x-k8s.io
 layout:
 - go.kubebuilder.io/v3
 projectName: cluster-api-provider-microvm
-repo: github.com/weaveworks-liquidmetal/cluster-api-provider-microvm
+repo: github.com/liquidmetal-dev/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-liquidmetal/cluster-api-provider-microvm/api/v1alpha1
+  path: github.com/liquidmetal-dev/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-liquidmetal/cluster-api-provider-microvm/api/v1alpha1
+  path: github.com/liquidmetal-dev/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-liquidmetal/cluster-api-provider-microvm/api/v1alpha1
+  path: github.com/liquidmetal-dev/cluster-api-provider-microvm/api/v1alpha1
   version: v1alpha1
 version: "3"

README.md

@@ -1,8 +1,8 @@
 # Cluster API provider Microvm
 
 [![License: MPL 2.0](https://img.shields.io/badge/License-MPL_2.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
-![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/weaveworks-liquidmetal/cluster-api-provider-microvm)
-[![Go Report Card](https://goreportcard.com/badge/github.com/weaveworks-liquidmetal/cluster-api-provider-microvm)](https://goreportcard.com/report/github.com/weaveworks-liquidmetal/cluster-api-provider-microvm)
+![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/liquidmetal-dev/cluster-api-provider-microvm)
+[![Go Report Card](https://goreportcard.com/badge/github.com/liquidmetal-dev/cluster-api-provider-microvm)](https://goreportcard.com/report/github.com/liquidmetal-dev/cluster-api-provider-microvm)
 [![Slack](https://img.shields.io/badge/join%20slack-%23liquid--metal-brightgreen)](https://weave-community.slack.com/archives/C02KARWGR7S)
 
 ------
@@ -60,24 +60,24 @@ Other interesting resources include:
 Thank you to our contributors:
 
 <p>
-<a href="https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=weaveworks-liquidmetal/cluster-api-provider-microvm" />
+<a href="https://github.com/liquidmetal-dev/cluster-api-provider-microvm/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=liquidmetal-dev/cluster-api-provider-microvm" />
 </a>
 </p>
 
 <!-- References -->
 [prow]: https://go.k8s.io/bot-commands
-[new_issue]: https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/issues/new/choose
+[new_issue]: https://github.com/liquidmetal-dev/cluster-api-provider-microvm/issues/new/choose
 [cluster_api]: https://github.com/kubernetes-sigs/cluster-api
 [tilt]: https://tilt.dev
 [cluster_api_tilt]: https://master.cluster-api.sigs.k8s.io/developer/tilt.html
 [cluster-api-supported-v]: https://cluster-api.sigs.k8s.io/reference/versions.html
-[flintlock]: https://github.com/weaveworks-liquidmetal/flintlock
+[flintlock]: https://github.com/liquidmetal-dev/flintlock
 [firecracker]: https://firecracker-microvm.github.io/
 [cloudhypervisor]: https://www.cloudhypervisor.org/
 [contrib]: ./CONTRIBUTING.md
 [coc]: ./CODE_OF_CONDUCT.md
-[milestones]: https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/milestones
+[milestones]: https://github.com/liquidmetal-dev/cluster-api-provider-microvm/milestones
 [adr]: ./docs/adr
 [license]: ./LICENSE
-[issues]: https://github.com/weaveworks-liquidmetal/cluster-api-provider-microvm/issues
+[issues]: https://github.com/liquidmetal-dev/cluster-api-provider-microvm/issues

api/v1alpha1/defaults.go

@@ -1,7 +1,7 @@
 package v1alpha1
 
 import (
-	"github.com/weaveworks-liquidmetal/controller-pkg/types/microvm"
+	"github.com/liquidmetal-dev/controller-pkg/types/microvm"
 	"github.com/yitsushi/macpot"
 )
 

api/v1alpha1/microvmcluster_types.go

@@ -4,8 +4,8 @@
 package v1alpha1
 
 import (
-	flclient "github.com/weaveworks-liquidmetal/controller-pkg/client"
-	"github.com/weaveworks-liquidmetal/controller-pkg/types/microvm"
+	flclient "github.com/liquidmetal-dev/controller-pkg/client"
+	"github.com/liquidmetal-dev/controller-pkg/types/microvm"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )