Rename package, update deps and add gha (#39)

.github/workflows/release.yaml

@@ -0,0 +1,42 @@
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+
+name: release
+
+jobs:
+  build:
+    name: tag release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set env
+        run: echo "RELEASE_TAG=${GITHUB_REF:10}" >> $GITHUB_ENV
+
+      - name: checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install go
+        uses: actions/[email protected]
+        with:
+          go-version: "^1.20"
+
+      - name: generate release artifacts
+        run: |
+          make release
+
+      - name: generate release notes
+        run: |
+          make release-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          files: out/*
+          body_path: _releasenotes/release-notes-${{ env.RELEASE_TAG }}.md

Makefile

@@ -1,4 +1,4 @@
-GO_VERSION ?= 1.19.0
+GO_VERSION ?= 1.20.0
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 
 ARCH ?= $(shell go env GOARCH)
@@ -20,10 +20,10 @@ TOOLS_BIN_DIR := $(abspath $(BIN_DIR))
 
 
 # Image URL to use all building/pushing image targets
-BOOTSTRAP_IMG ?= ghcr.io/zawachte/cluster-api-k3s/bootstrap-controller:v0.1.5
+BOOTSTRAP_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/bootstrap-controller:v0.2.0
 
 # Image URL to use all building/pushing image targets
-CONTROLPLANE_IMG ?= ghcr.io/zawachte/cluster-api-k3s/controlplane-controller:v0.1.5
+CONTROLPLANE_IMG ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/controlplane-controller:v0.2.0
 
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
@@ -38,7 +38,7 @@ endif
 
 CONTROLLER_GEN_BIN = controller-gen
 CONTROLLER_GEN_PKG = "sigs.k8s.io/controller-tools/cmd/controller-gen"
-CONTROLLER_GEN_VER = "v0.8.0"
+CONTROLLER_GEN_VER = "v0.12.0"
 CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))
 
 .PHONY: controller-gen

bootstrap/PROJECT

@@ -1,5 +1,5 @@
 domain: cluster.x-k8s.io
-repo: github.com/zawachte/cluster-api-k3s/bootstrap
+repo: github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap
 resources:
 - group: bootstrap
   kind: KThreesConfig

bootstrap/controllers/kthreesconfig_controller.go

@@ -29,13 +29,13 @@ import (
 
 	"time"
 
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/k3s"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/kubeconfig"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/locking"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/token"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	"github.com/zawachte/cluster-api-k3s/pkg/k3s"
-	"github.com/zawachte/cluster-api-k3s/pkg/kubeconfig"
-	"github.com/zawachte/cluster-api-k3s/pkg/locking"
-	"github.com/zawachte/cluster-api-k3s/pkg/secret"
-	"github.com/zawachte/cluster-api-k3s/pkg/token"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -50,8 +50,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	bootstrapv1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
-	"github.com/zawachte/cluster-api-k3s/pkg/cloudinit"
+	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/cloudinit"
 )
 
 // InitLocker is a lock that is used around k3s init

bootstrap/controllers/suite_test.go

@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
-	bootstrapv1beta1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
+	bootstrapv1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
 	// +kubebuilder:scaffold:imports
 )
 

bootstrap/main.go

@@ -27,8 +27,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	bootstrapv1beta1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
-	"github.com/zawachte/cluster-api-k3s/bootstrap/controllers"
+	bootstrapv1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/controllers"
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	expv1beta1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
 	// +kubebuilder:scaffold:imports

controlplane/PROJECT

@@ -1,5 +1,5 @@
 domain: cluster.x-k8s.io
-repo: github.com/zawachte/cluster-api-k3s/controlplane
+repo: github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane
 resources:
 - group: controlplane
   kind: KThreesControlPlane

controlplane/api/v1beta1/kthreescontrolplane_types.go

@@ -17,12 +17,12 @@ limitations under the License.
 package v1beta1
 
 import (
-	"github.com/zawachte/cluster-api-k3s/pkg/errors"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	cabp3v1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
+	cabp3v1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
 )
 
 const (

controlplane/controllers/kthreescontrolplane_controller.go

@@ -31,10 +31,10 @@ import (
 
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/kubeconfig"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	"github.com/zawachte/cluster-api-k3s/pkg/kubeconfig"
-	"github.com/zawachte/cluster-api-k3s/pkg/secret"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -54,9 +54,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	controlplanev1 "github.com/zawachte/cluster-api-k3s/controlplane/api/v1beta1"
-	k3s "github.com/zawachte/cluster-api-k3s/pkg/k3s"
-	"github.com/zawachte/cluster-api-k3s/pkg/machinefilters"
+	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
+	k3s "github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/k3s"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
 )
 
 // KThreesControlPlaneReconciler reconciles a KThreesControlPlane object

controlplane/controllers/scale.go

@@ -21,12 +21,12 @@ import (
 	"encoding/json"
 	"strings"
 
+	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
 	"github.com/pkg/errors"
-	bootstrapv1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/zawachte/cluster-api-k3s/controlplane/api/v1beta1"
 
-	k3s "github.com/zawachte/cluster-api-k3s/pkg/k3s"
-	"github.com/zawachte/cluster-api-k3s/pkg/machinefilters"
+	k3s "github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/k3s"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

controlplane/controllers/suite_test.go

@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 
-	controlplanev1beta1 "github.com/zawachte/cluster-api-k3s/controlplane/api/v1beta1"
+	controlplanev1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
 	// +kubebuilder:scaffold:imports
 )
 

controlplane/main.go

@@ -27,10 +27,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	controlplanev1beta1 "github.com/zawachte/cluster-api-k3s/controlplane/api/v1beta1"
-	"github.com/zawachte/cluster-api-k3s/controlplane/controllers"
+	controlplanev1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/controllers"
 
-	bootstrapv1beta1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
+	bootstrapv1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	expv1beta1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
 	// +kubebuilder:scaffold:imports

go.mod

@@ -1,4 +1,4 @@
-module github.com/zawachte/cluster-api-k3s
+module github.com/cluster-api-provider-k3s/cluster-api-k3s
 
 go 1.13
 

pkg/cloudinit/cloudinit.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"text/template"
 
+	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
 	"github.com/pkg/errors"
-	bootstrapv1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
 )
 
 var (

pkg/cloudinit/controlplane_init.go

@@ -19,7 +19,7 @@ package cloudinit
 import (
 	"fmt"
 
-	"github.com/zawachte/cluster-api-k3s/pkg/secret"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
 )
 
 const (

pkg/cloudinit/controlplane_init_test.go

@@ -19,9 +19,9 @@ package cloudinit
 import (
 	"testing"
 
+	infrav1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
 	. "github.com/onsi/gomega"
-	infrav1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
-	"github.com/zawachte/cluster-api-k3s/pkg/secret"
 )
 
 func TestControlPlaneInit(t *testing.T) {

pkg/k3s/config.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	bootstrapv1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
 )
 
 const DefaultK3sConfigLocation = "/etc/rancher/k3s/config.yaml"

pkg/k3s/control_plane.go

@@ -19,9 +19,9 @@ package k3s
 import (
 	"context"
 
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
-	"github.com/zawachte/cluster-api-k3s/pkg/machinefilters"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,9 +30,9 @@ import (
 	"k8s.io/apiserver/pkg/storage/names"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	bootstrapv1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
 
-	controlplanev1 "github.com/zawachte/cluster-api-k3s/controlplane/api/v1beta1"
+	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/external"
 
 	"sigs.k8s.io/cluster-api/util/patch"

pkg/k3s/machine_collection.go

@@ -32,7 +32,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	"github.com/zawachte/cluster-api-k3s/pkg/machinefilters"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
 
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/conditions"

pkg/k3s/management_cluster.go

@@ -9,7 +9,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/remote"
 
-	"github.com/zawachte/cluster-api-k3s/pkg/machinefilters"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"

pkg/k3s/workload_cluster.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
+	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
 	"github.com/pkg/errors"
-	controlplanev1 "github.com/zawachte/cluster-api-k3s/controlplane/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/k3s/workload_cluster_coredns.go

@@ -20,9 +20,9 @@ import (
 	"context"
 	"fmt"
 
+	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
 	"github.com/coredns/corefile-migration/migration"
 	"github.com/pkg/errors"
-	controlplanev1 "github.com/zawachte/cluster-api-k3s/controlplane/api/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/kubeconfig/kubeconfig.go

@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/certs"
 
-	"github.com/zawachte/cluster-api-k3s/pkg/secret"
+	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

pkg/machinefilters/machine_filters.go

@@ -17,14 +17,14 @@ limitations under the License.
 package machinefilters
 
 import (
-	bootstrapv1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	controlplanev1 "github.com/zawachte/cluster-api-k3s/controlplane/api/v1beta1"
+	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
 
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/conditions"

pkg/secret/certificates.go

@@ -29,8 +29,8 @@ import (
 	"strings"
 	"time"
 
+	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
 	"github.com/pkg/errors"
-	bootstrapv1 "github.com/zawachte/cluster-api-k3s/bootstrap/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"