Skip to content

Commit b5b0888

Browse files
authored
Rename to cluster-api-provider-incus (#58)
* Rename cluster-api-provider-lxc -> cluster-api-provider-incus - namespace: capl-system -> capn-system - deployment: capl-controller-manager -> capn-controller-manager - resources: keep using LXCCluster and LXCMachine kinds - provider name: lxc -> incus - clusterclass: lxc-default -> capn-default - go: github.com/neoaggelos/cluster-api-provider-lxc -> github.com/lxc/cluster-api-provider-incus * use e2eCtx.OverrideVariables over ClusterctlVariables Signed-off-by: Angelos Kolaitis <neoaggelos@gmail.com>
1 parent c5f96a1 commit b5b0888

File tree

83 files changed

+252
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+252
-288
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ about: Something is not working
3434
<!-- yes/no, or @mention maintainers. Community contributions are welcome. -->
3535

3636

37-
<!-- Thank you for making cluster-api-provider-lxc better -->
37+
<!-- Thank you for making cluster-api-provider-incus better -->

.github/ISSUE_TEMPLATE/feature-request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ about: Suggest a new feature
1818
<!-- yes/no, or @mention maintainers. -->
1919

2020

21-
<!-- Thank you for making cluster-api-provider-lxc better -->
21+
<!-- Thank you for making cluster-api-provider-incus better -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Thank you for making cluster-api-provider-lxc better. Please fill the template below
2+
Thank you for making cluster-api-provider-incus better. Please fill the template below
33
with more details.
44
-->
55

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ linters-settings:
5050
goimports:
5151
# put imports beginning with prefix after 3rd-party packages;
5252
# it's a comma-separated list of prefixes
53-
local-prefixes: github.com/neoaggelos/cluster-api-provider-lxc
53+
local-prefixes: github.com/lxc/cluster-api-provider-incus
5454

5555
gci:
5656
sections:
5757
- standard
5858
- default
59-
- prefix(github.com/neoaggelos/cluster-api-provider-lxc)
59+
- prefix(github.com/lxc/cluster-api-provider-incus)
6060
- dot

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Image URL to use all building/pushing image targets
22
TAG ?= latest
3-
IMG ?= ghcr.io/neoaggelos/cluster-api-provider-lxc:$(TAG)
3+
IMG ?= ghcr.io/lxc/cluster-api-provider-incus:$(TAG)
44

55
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
66
ENVTEST_K8S_VERSION = 1.31.0
@@ -94,7 +94,7 @@ _SKIP_ARGS := $(foreach arg,$(strip $(E2E_GINKGO_SKIP)),-skip="$(arg)")
9494
endif
9595

9696
.PHONY: e2e-image
97-
e2e-image: IMG = ghcr.io/neoaggelos/cluster-api-provider-lxc:e2e ## Build controller image for e2e tests
97+
e2e-image: IMG = ghcr.io/lxc/cluster-api-provider-incus:e2e ## Build controller image for e2e tests
9898
e2e-image: docker-build
9999

100100
E2E_DATA_DIR ?= $(REPO_ROOT)/test/e2e/data

PROJECT

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ domain: cluster.x-k8s.io
66
layout:
77
- go.kubebuilder.io/v4
88
projectName: test
9-
repo: github.com/neoaggelos/cluster-api-provider-lxc
9+
repo: github.com/lxc/cluster-api-provider-incus
1010
resources:
1111
- api:
1212
crdVersion: v1
@@ -15,23 +15,23 @@ resources:
1515
domain: cluster.x-k8s.io
1616
group: infrastructure
1717
kind: LXCCluster
18-
path: github.com/neoaggelos/cluster-api-provider-lxc/api/v1alpha2
18+
path: github.com/lxc/cluster-api-provider-incus/api/v1alpha2
1919
version: v1alpha2
2020
- api:
2121
crdVersion: v1
2222
namespaced: true
2323
domain: cluster.x-k8s.io
2424
group: infrastructure
2525
kind: LXCClusterTemplate
26-
path: github.com/neoaggelos/cluster-api-provider-lxc/api/v1alpha2
26+
path: github.com/lxc/cluster-api-provider-incus/api/v1alpha2
2727
version: v1alpha2
2828
- api:
2929
crdVersion: v1
3030
namespaced: true
3131
domain: cluster.x-k8s.io
3232
group: infrastructure
3333
kind: LXCMachineTemplate
34-
path: github.com/neoaggelos/cluster-api-provider-lxc/api/v1alpha2
34+
path: github.com/lxc/cluster-api-provider-incus/api/v1alpha2
3535
version: v1alpha2
3636
- api:
3737
crdVersion: v1
@@ -40,6 +40,6 @@ resources:
4040
domain: cluster.x-k8s.io
4141
group: infrastructure
4242
kind: LXCMachine
43-
path: github.com/neoaggelos/cluster-api-provider-lxc/api/v1alpha2
43+
path: github.com/lxc/cluster-api-provider-incus/api/v1alpha2
4444
version: v1alpha2
4545
version: "3"

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
# Kubernetes Cluster API Provider LXC
1+
# Kubernetes Cluster API Provider Incus
22

3-
[![End to End Tests](https://github.com/neoaggelos/cluster-api-provider-lxc/actions/workflows/test-e2e-full.yml/badge.svg)](https://github.com/neoaggelos/cluster-api-provider-lxc/actions/workflows/test-e2e-full.yml)
4-
[![End to End Tests [Conformance]](https://github.com/neoaggelos/cluster-api-provider-lxc/actions/workflows/test-e2e-conformance.yml/badge.svg)](https://github.com/neoaggelos/cluster-api-provider-lxc/actions/workflows/test-e2e-conformance.yml)
5-
[![Unit Tests](https://github.com/neoaggelos/cluster-api-provider-lxc/actions/workflows/test.yml/badge.svg)](https://github.com/neoaggelos/cluster-api-provider-lxc/actions/workflows/test.yml)
6-
[![Deploy GitHub Pages](https://github.com/neoaggelos/cluster-api-provider-lxc/actions/workflows/docs.yml/badge.svg)](https://github.com/neoaggelos/cluster-api-provider-lxc/actions/workflows/docs.yml)
3+
[![End to End Tests](https://github.com/lxc/cluster-api-provider-incus/actions/workflows/test-e2e-full.yml/badge.svg)](https://github.com/lxc/cluster-api-provider-incus/actions/workflows/test-e2e-full.yml)
4+
[![End to End Tests [Conformance]](https://github.com/lxc/cluster-api-provider-incus/actions/workflows/test-e2e-conformance.yml/badge.svg)](https://github.com/lxc/cluster-api-provider-incus/actions/workflows/test-e2e-conformance.yml)
5+
[![Unit Tests](https://github.com/lxc/cluster-api-provider-incus/actions/workflows/test.yml/badge.svg)](https://github.com/lxc/cluster-api-provider-incus/actions/workflows/test.yml)
6+
[![Deploy GitHub Pages](https://github.com/lxc/cluster-api-provider-incus/actions/workflows/docs.yml/badge.svg)](https://github.com/lxc/cluster-api-provider-incus/actions/workflows/docs.yml)
77

88
Kubernetes-native declarative infrastructure for [Incus](https://linuxcontainers.org/incus/introduction/), [Canonical LXD](https://canonical.com/lxd) and [Canonical MicroCloud](https://canonical.com/microcloud).
99

10-
## What is the Cluster API Provider LXC
10+
## What is the Cluster API Provider Incus
1111

1212
[Cluster API](https://cluster-api.sigs.k8s.io) is a Kubernetes sub-project focused on providing declarative APIs and tooling to simplify provisioning, upgrading, and operating multiple Kubernetes clusters.
1313

14-
`cluster-api-provider-lxc` (CAPL) is an Infrastructure Provider for Cluster API, which enables deploying clusters on infrastructure operated by [Incus](https://linuxcontainers.org/incus/introduction/), [Canonical LXD](https://canonical.com/lxd) and [Canonical MicroCloud](https://canonical.com/microcloud).
14+
`cluster-api-provider-incus` (CAPN) is an Infrastructure Provider for Cluster API, which enables deploying clusters on infrastructure operated by [Incus](https://linuxcontainers.org/incus/introduction/), [Canonical LXD](https://canonical.com/lxd) and [Canonical MicroCloud](https://canonical.com/microcloud).
1515

1616
The provider can be used in single-node development environments for evaluation and testing, but also work with multi-node clusters to deploy and manage production Kubernetes clusters.
1717

1818
## Documentation
1919

20-
Please refer to our [book](https://neoaggelos.github.io/cluster-api-provider-lxc) for in-depth documentation.
20+
Please refer to our [book](https://lxc.github.io/cluster-api-provider-incus) for in-depth documentation.
2121

2222
## Quick Start
2323

24-
See [Quick Start](https://neoaggelos.github.io/cluster-api-provider-lxc/tutorial/quick-start.html) to launch a cluster on a single-node development environment.
24+
See [Quick Start](https://lxc.github.io/cluster-api-provider-incus/tutorial/quick-start.html) to launch a cluster on a single-node development environment.
2525

2626
## Features
2727

2828
- Supports [Incus](https://linuxcontainers.org/incus/introduction/), [Canonical LXD](https://canonical.com/lxd) and [Canonical MicroCloud](https://canonical.com/microcloud).
29-
- Support for [kube-vip](https://neoaggelos.github.io/cluster-api-provider-lxc/reference/templates/kube-vip.html) (production), [OVN network load balancers](https://neoaggelos.github.io/cluster-api-provider-lxc/reference/templates/ovn.html) or simple [haproxy containers](https://neoaggelos.github.io/cluster-api-provider-lxc/reference/templates/development.html) (development) for the cluster load balancer.
30-
- [Default simplestreams server](https://neoaggelos.github.io/cluster-api-provider-lxc/reference/default-simplestreams-server.html) with pre-built kubeadm images.
31-
- Supports virtual machines or LXC containers for the cluster machines. Automatically manages the [profile](https://neoaggelos.github.io/cluster-api-provider-lxc/reference/profile/kubeadm.html) for Kubernetes to work in LXC containers.
29+
- Support for [kube-vip](https://lxc.github.io/cluster-api-provider-incus/reference/templates/kube-vip.html) (production), [OVN network load balancers](https://lxc.github.io/cluster-api-provider-incus/reference/templates/ovn.html) or simple [haproxy containers](https://lxc.github.io/cluster-api-provider-incus/reference/templates/development.html) (development) for the cluster load balancer.
30+
- [Default simplestreams server](https://lxc.github.io/cluster-api-provider-incus/reference/default-simplestreams-server.html) with pre-built kubeadm images.
31+
- Supports virtual machines or LXC containers for the cluster machines. Automatically manages the [profile](https://lxc.github.io/cluster-api-provider-incus/reference/profile/kubeadm.html) for Kubernetes to work in LXC containers.
3232
- Can be used for local development similar to CAPD for quickly iterating on custom bootstrap and control-plane providers, e.g. K3s, Canonical Kubernetes, etc.
3333

3434
## Project Roadmap
@@ -40,7 +40,7 @@ Rough steps for version v0.5.0:
4040
- [x] Private initial alpha testing.
4141
- [x] Cloud provider node patch to link Machines with workload cluster Nodes.
4242
- [x] Test with both [Incus](https://linuxcontainers.org/incus/introduction/) and [Canonical LXD](https://canonical.com/lxd).
43-
- [x] Start cluster-api-provider-lxc book with quick start guide, cluster templates, API reference.
43+
- [x] Start cluster-api-provider-incus book with quick start guide, cluster templates, API reference.
4444
- [x] Publish v0.1.0 release to get initial user feedback.
4545
- [x] Add e2e tests using the cluster-api testing framework.
4646
- [x] Add PR blocking CI pipelines.
@@ -59,15 +59,15 @@ Rough steps for version v0.5.0:
5959

6060
- [ ] Improve API validations and possibly API conformance tests.
6161
- [ ] Add CI to build and push kubeadm and haproxy images to the default simplestreams server.
62-
- [ ] Decide on project OWNERSHIP and testing infrastructure.
62+
- [X] Decide on project OWNERSHIP and testing infrastructure (part of LXC org).
6363
- [ ] Split cloud provider node patch to external cloud-provider-incus project.
6464
- [ ] Refactor `internal/incus` package and improve consistency and log levels across the code.
6565
- [ ] Add to default list of providers supported by ClusterAPI.
6666

6767
## Getting involved and contributing
6868

69-
The `cluster-api-provider-lxc` project would love your suggestions, contributions and help! The maintainers can be contacted at any time to learn mode about how to get involved.
69+
The `cluster-api-provider-incus` project would love your suggestions, contributions and help! The maintainers can be contacted at any time to learn mode about how to get involved.
7070

7171
Remember that there are numerous effective ways to contribute to the project: raise a pull request to fix a bug, improve test coverage, improve existing documentation or even participate in GitHub issues. We want your help!
7272

73-
Please refer to the [developer guide](https://neoaggelos.github.io/cluster-api-provider-lxc/howto/developer-guide.html) in order to get started with setting up a local environment for development and testing.
73+
Please refer to the [developer guide](https://lxc.github.io/cluster-api-provider-incus/howto/developer-guide.html) in order to get started with setting up a local environment for development and testing.

clusterctl.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
providers:
2-
- name: lxc
2+
- name: incus
33
type: InfrastructureProvider
4-
url: https://github.com/neoaggelos/cluster-api-provider-lxc/releases/latest/infrastructure-components.yaml
4+
url: https://github.com/lxc/cluster-api-provider-incus/releases/latest/infrastructure-components.yaml

cmd/main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ import (
4848
"sigs.k8s.io/controller-runtime/pkg/healthz"
4949
"sigs.k8s.io/controller-runtime/pkg/webhook"
5050

51-
infrav1 "github.com/neoaggelos/cluster-api-provider-lxc/api/v1alpha2"
52-
"github.com/neoaggelos/cluster-api-provider-lxc/internal/controller/lxccluster"
53-
"github.com/neoaggelos/cluster-api-provider-lxc/internal/controller/lxcmachine"
51+
infrav1 "github.com/lxc/cluster-api-provider-incus/api/v1alpha2"
52+
"github.com/lxc/cluster-api-provider-incus/internal/controller/lxccluster"
53+
"github.com/lxc/cluster-api-provider-incus/internal/controller/lxcmachine"
5454
)
5555

5656
var (
5757
scheme = runtime.NewScheme()
5858
setupLog = ctrl.Log.WithName("setup")
59-
controllerName = "cluster-api-lxc-controller-manager"
59+
controllerName = "cluster-api-incus-controller-manager"
6060

6161
// flags.
6262
enableLeaderElection bool
@@ -80,7 +80,7 @@ var (
8080
managerOptions = flags.ManagerOptions{}
8181
logOptions = logs.NewOptions()
8282

83-
// CAPL specific flags.
83+
// CAPN specific flags.
8484
concurrency int
8585
clusterCacheConcurrency int
8686
)
@@ -221,7 +221,7 @@ func main() {
221221
ctrlOptions := ctrl.Options{
222222
Scheme: scheme,
223223
LeaderElection: enableLeaderElection,
224-
LeaderElectionID: "controller-leader-election-capl",
224+
LeaderElectionID: "controller-leader-election-capn",
225225
LeaseDuration: &leaderElectionLeaseDuration,
226226
RenewDeadline: &leaderElectionRenewDeadline,
227227
RetryPeriod: &leaderElectionRetryPeriod,

config/crd/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ patches:
2424

2525
labels:
2626
- pairs:
27-
cluster.x-k8s.io/provider: infrastructure-lxc
27+
cluster.x-k8s.io/provider: infrastructure-incus
2828
cluster.x-k8s.io/v1beta1: v1alpha2

0 commit comments

Comments
 (0)