Merge branch 'main' into feature/tilt

Author: sp-yduck

.github/workflows/docker-publish.yml

@@ -3,14 +3,13 @@ name: publish container image
 on:
   push:
     # Publish semver tags as releases.
-    tags: [ 'v*.*.*' ]
+    tags: ["v*.*.*"]
 
 env:
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -35,3 +34,9 @@ jobs:
       # platform = linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
       - name: Build and push Docker image
         run: "make docker-buildx PLATFORMS=linux/amd64,linux/arm64,linux/s390x,linux/ppc64le IMG=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}"
+
+      - name: push with 'latest' tag
+        run: |
+          docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+          docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

Makefile

@@ -1,7 +1,7 @@
 
 # Image URL to use all building/pushing image targets
 REGISTRY := ghcr.io
-PROJECT := sp-yduck/cluster-api-provider-proxmox
+PROJECT := k8s-proxmox/cluster-api-provider-proxmox
 RELEASE_TAG := latest
 IMG ?= $(REGISTRY)/$(PROJECT):$(RELEASE_TAG)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
@@ -152,7 +152,7 @@ unit-test-cover: ## Run unit tests and generate coverage report
 	go tool cover -html=coverage.out -o coverage.html
 
 E2E_DIR = $(shell pwd)/internal/test/e2e
-E2E_IMG := ghcr.io/sp-yduck/cluster-api-provider-proxmox:e2e
+E2E_IMG := ghcr.io/k8s-proxmox/cluster-api-provider-proxmox:e2e
 .PHONY: generate-e2e-templates
 generate-e2e-templates: $(KUSTOMIZE) ## Generate cluster-templates for e2e
 	cp templates/cluster-template* $(E2E_DIR)/data/infrastructure-proxmox/templates

README.md

@@ -1,29 +1,34 @@
 # cluster-api-provider-proxmox (CAPPX)
-[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/sp-yduck/cluster-api-provider-proxmox?sort=semver)](https://github.com/sp-yduck/cluster-api-provider-proxmox/releases/latest) [![Go Report Card](https://goreportcard.com/badge/github.com/sp-yduck/cluster-api-provider-proxmox)](https://goreportcard.com/report/github.com/sp-yduck/cluster-api-provider-proxmox) [![CI](https://github.com/sp-yduck/cluster-api-provider-proxmox/actions/workflows/ci.yaml/badge.svg)](https://github.com/sp-yduck/cluster-api-provider-proxmox/actions/workflows/ci.yaml) [![GitHub license](https://img.shields.io/github/license/sp-yduck/cluster-api-provider-proxmox)](https://github.com/sp-yduck/cluster-api-provider-proxmox/blob/main/LICENSE)
-----
+
+## [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/k8s-proxmox/cluster-api-provider-proxmox?sort=semver)](https://github.com/k8s-proxmox/cluster-api-provider-proxmox/releases/latest) [![Go Report Card](https://goreportcard.com/badge/github.com/k8s-proxmox/cluster-api-provider-proxmox)](https://goreportcard.com/report/github.com/k8s-proxmox/cluster-api-provider-proxmox) [![CI](https://github.com/k8s-proxmox/cluster-api-provider-proxmox/actions/workflows/ci.yaml/badge.svg)](https://github.com/k8s-proxmox/cluster-api-provider-proxmox/actions/workflows/ci.yaml) [![GitHub license](https://img.shields.io/github/license/k8s-proxmox/cluster-api-provider-proxmox)](https://github.com/k8s-proxmox/cluster-api-provider-proxmox/blob/main/LICENSE)
 
 cluster-api-provider-proxmox is a Cluster API [infrastructure provider](https://cluster-api.sigs.k8s.io/developer/providers/cluster-infrastructure.html) implementation for [Proxmox VE](https://pve.proxmox.com/wiki/Main_Page).
 
 ## Description
+
 cluster-api-provider-proxmox provides only infrastructure controller (`ProxmoxCluster` and `ProxmoxMachine`). To bootstrap your cluster/machine you need to provide [Control Plane provider](https://cluster-api.sigs.k8s.io/developer/architecture/controllers/control-plane.html#crd-contracts) and [Bootstrap provider](https://cluster-api.sigs.k8s.io/developer/providers/bootstrap.html). For example [KubeadmControlPlane](https://github.com/kubernetes-sigs/cluster-api/tree/main/controlplane/kubeadm) and [KubeadmBootstrap](https://github.com/kubernetes-sigs/cluster-api/tree/main/bootstrap/kubeadm).
 
 ## Quick Start
+
 You’ll need a Kubernetes cluster to run against. You can use [KIND](https://sigs.k8s.io/kind) to get a local cluster for testing, or run against a remote cluster.
 **Note:** Your controller will automatically use the current context in your kubeconfig file (i.e. whatever cluster `kubectl cluster-info` shows).
 
 ### with KubeadmControlplane/Bootstrap
+
 1. Initialize Management cluster
 
 for more information : https://cluster-api.sigs.k8s.io/user/quick-start.html#initialize-the-management-cluster
 
 ```sh
 # install cluster-api components
 export EXP_CLUSTER_RESOURCE_SET=true
-clusterctl init --infrastructure=proxmox:v0.3.3 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml
+clusterctl init --infrastructure=proxmox:v0.3.3 --config https://raw.githubusercontent.com/k8s-proxmox/cluster-api-provider-proxmox/main/clusterctl.yaml
 ```
-**Note:** container images are available at [ghcr.io/sp-yduck/cluster-api-provider-proxmox:\<tag\>](https://github.com/sp-yduck/cluster-api-provider-proxmox/pkgs/container/cluster-api-provider-proxmox)
+
+**Note:** container images are available at [ghcr.io/k8s-proxmox/cluster-api-provider-proxmox:\<tag\>](https://github.com/k8s-proxmox/cluster-api-provider-proxmox/pkgs/container/cluster-api-provider-proxmox)
 
 2. Create your first workload cluster
+
 ```sh
 # export env variables
 export CONTROLPLANE_HOST=X.X.X.X                   # control-plane vip
@@ -32,7 +37,7 @@ export PROXMOX_PASSWORD=password
 export PROXMOX_USER=user@pam
 
 # generate manifests (available flags: --target-namespace, --kubernetes-version, --control-plane-machine-count, --worker-machine-count)
-clusterctl generate cluster cappx-test --control-plane-machine-count=3 --infrastructure=proxmox:v0.3.3 --config https://raw.githubusercontent.com/sp-yduck/cluster-api-provider-proxmox/main/clusterctl.yaml > cappx-test.yaml
+clusterctl generate cluster cappx-test --control-plane-machine-count=3 --infrastructure=proxmox:v0.3.3 --config https://raw.githubusercontent.com/k8s-proxmox/cluster-api-provider-proxmox/main/clusterctl.yaml > cappx-test.yaml
 
 # inspect and edit
 vi cappx-test.yaml
@@ -44,6 +49,7 @@ kubectl apply -f cappx-test.yaml
 3. Access your first workload cluster !!
 
 Usually it takes 2~10 mins to complete bootstrapping the nodes.
+
 ```sh
 # get workload cluster's kubeconfig
 clusterctl get kubeconfig cappx-test > kubeconfig.yaml
@@ -53,27 +59,26 @@ kubectl --kubeconfig=kubeconfig.yaml get node
 ```
 
 4. Tear down your workload cluster
+
 ```sh
 kubectl delete cluster cappx-test
 ```
 
 ## Fetures
 
-- No need to prepare vm templates. You can specify any vm image in `ProxmoxMachine.Spec.Image`. CAPPX bootstrap your vm from scratch.
-
-- Supports mutiple image format. CAPPX uses VNC websocket for downloading/installing node images so it can support multiple image format not only ISO (Proxmox API can only support ISO)
+- No need to prepare vm templates. You can specify any vm image in `ProxmoxMachine.Spec.Image`. CAPPX bootstrap your vm from scratch. (Supports `iso` type of image format.)
 
 - Supports custom cloud-config (user data). CAPPX uses VNC websockert for bootstrapping nodes so it can applies custom cloud-config that can not be achieved by only Proxmox API.
 
 - Flexible vmid/node assigning. You can flexibly assign vmid to your qemu and flexibly schedule qemus to proxmox nodes. For more details please check [qemu-scheduler](./cloud/scheduler/).
 
 ### Node Images
 
-CAPPX is compatible with `iso`, `qcow2`, `qed`, `raw`, `vdi`, `vpc`, `vmdk` format of image. You can build your own node image and use it for `ProxmoxMachine`.
+CAPPX is compatible with `iso` format of image. You can build your own node image and use it for `ProxmoxMachine`.
 
 CAPPX relies on a few prerequisites which have to be already installed in the used operating system images, e.g. a container runtime, kubelet, kubeadm,.. .
 
-To build your custom node image, you can use [kubernetes-sigs/image-builder](https://github.com/kubernetes-sigs/image-builder) project. 
+To build your custom node image, you can use [kubernetes-sigs/image-builder](https://github.com/kubernetes-sigs/image-builder) project.
 
 Also there are some available out-of-box images published other communities such as [Metal3](https://github.com/metal3-io). For example https://artifactory.nordix.org/ui/native/metal3/images/. Example MD can be found [metal3-ubuntu2204-k8s127.yaml](examples/machine_deployment/metal3-ubuntu2204-k8s127.yaml).
 
@@ -91,11 +96,12 @@ CAPPX is tested with `pve-manager/7.4-3/9002ab8a (running kernel: 5.15.102-1-pve
 | ---------------------- | :------------------: | :-----------------: |
 | CAPPX v1beta1 `(v0.x)` |          ?           |          ✓          |
 
-### ControlPlane & Bootstrap provider 
+### ControlPlane & Bootstrap provider
 
 CAPPX is tested with [KubeadmControlPlane](https://github.com/kubernetes-sigs/cluster-api/tree/main/controlplane/kubeadm) and [KubeadmBootstrap](https://github.com/kubernetes-sigs/cluster-api/tree/main/bootstrap/kubeadm).
 
 ## How it works
+
 This project aims to follow the Cluster API [Provider contract](https://cluster-api.sigs.k8s.io/developer/providers/contracts.html).
 
 ### ProxmoxCluster
@@ -109,12 +115,15 @@ ProxmoxMachine controller follows the [typical infra-machine logic](https://clus
 ## Development
 
 ### Testing
+
 #### Unit Testing
+
 ```sh
 make unit-test
 ```
 
 #### Unit and Integration Testing
+
 ```sh
 export PROXMOX_URL=https://X.X.X.X:8006/api2/json
 export PROXMOX_PASSWORD=password
@@ -124,6 +133,7 @@ make test
 ```
 
 #### E2E Testing
+
 ```sh
 export CONTROLPLANE_HOST=X.X.X.X
 export PROXMOX_URL=https://X.X.X.X:8006/api2/json
@@ -152,4 +162,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-

api/v1beta1/proxmoxmachine_types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	"github.com/sp-yduck/proxmox-go/api"
+	"github.com/k8s-proxmox/proxmox-go/api"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"

api/v1beta1/type.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/sp-yduck/proxmox-go/api"
+	"github.com/k8s-proxmox/proxmox-go/api"
 )
 
 type InstanceStatus string

cloud/cloudinit/user.go

@@ -6,7 +6,7 @@ import (
 	"github.com/imdario/mergo"
 	"gopkg.in/yaml.v3"
 
-	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
+	infrav1 "github.com/k8s-proxmox/cluster-api-provider-proxmox/api/v1beta1"
 )
 
 func ParseUserData(content string) (*infrav1.UserData, error) {

cloud/cloudinit/user_test.go

@@ -6,8 +6,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
-	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/cloudinit"
+	infrav1 "github.com/k8s-proxmox/cluster-api-provider-proxmox/api/v1beta1"
+	"github.com/k8s-proxmox/cluster-api-provider-proxmox/cloud/cloudinit"
 )
 
 func TestCloudInit(t *testing.T) {

cloud/interfaces.go

@@ -3,12 +3,12 @@ package cloud
 import (
 	"context"
 
-	"github.com/sp-yduck/proxmox-go/api"
-	"github.com/sp-yduck/proxmox-go/proxmox"
+	"github.com/k8s-proxmox/proxmox-go/api"
+	"github.com/k8s-proxmox/proxmox-go/proxmox"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
-	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/scheduler"
+	infrav1 "github.com/k8s-proxmox/cluster-api-provider-proxmox/api/v1beta1"
+	"github.com/k8s-proxmox/cluster-api-provider-proxmox/cloud/scheduler"
 )
 
 type Reconciler interface {

cloud/providerid/providerid_test.go

@@ -6,7 +6,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/sp-yduck/cluster-api-provider-proxmox/cloud/providerid"
+	"github.com/k8s-proxmox/cluster-api-provider-proxmox/cloud/providerid"
 )
 
 func TestProviderID(t *testing.T) {

cloud/scheduler/framework/cycle_state.go

@@ -1,8 +1,8 @@
 package framework
 
 import (
-	"github.com/sp-yduck/proxmox-go/api"
-	"github.com/sp-yduck/proxmox-go/proxmox"
+	"github.com/k8s-proxmox/proxmox-go/api"
+	"github.com/k8s-proxmox/proxmox-go/proxmox"
 )
 
 type CycleState struct {