Merge branch 'main' into cns-1817

docs/src/flavors/clusterclass-kubeadm.md

@@ -0,0 +1,59 @@
+# Kubeadm ClusterClass
+## Specification
+| Control Plane | CNI    | Default OS   | Installs ClusterClass |
+|---------------|--------|--------------|-----------------------|
+| Kubeadm       | Cilium | Ubuntu 22.04 | Yes                   | 
+## Prerequisites
+[Quickstart](../topics/getting-started.md) completed
+## Usage
+### Create clusterClass and first cluster
+1. Generate the ClusterClass and cluster manifests
+    ```bash
+    clusterctl generate cluster test-cluster --infrastructure linode:0.0.0  --flavor clusterclass-kubeadm > test-cluster.yaml
+    ```
+2. Apply cluster manifests
+    ```bash
+    kubectl apply -f test-cluster.yaml
+    ```
+### (Optional) Create a second cluster using the existing ClusterClass
+1.  Generate cluster manifests
+      ```bash
+      clusterctl generate cluster test-cluster-2 --flavor clusterclass-kubeadm > test-cluster-2.yaml
+      ```
+      ```yaml
+      apiVersion: cluster.x-k8s.io/v1beta1
+      kind: Cluster
+      metadata:
+        labels:
+          ccm: linode
+          cni: cilium
+          crs: test-cluster-2-crs
+        name: test-cluster-2
+        namespace: default
+      spec:
+        clusterNetwork:
+          pods:
+            cidrBlocks:
+            - 192.168.128.0/17
+        topology:
+          class: kubeadm
+          controlPlane:
+            replicas: 1
+          variables:
+          - name: region
+            value: us-ord
+          - name: controlPlaneMachineType
+            value: g6-standard-2
+          - name: workerMachineType
+            value: g6-standard-2
+          version: v1.29.1
+          workers:
+            machineDeployments:
+            - class: default-worker
+              name: md-0
+              replicas: 1
+      ```
+2. Apply cluster manifests
+    ```bash
+    kubectl apply -f test-cluster-2.yaml
+    ```

docs/src/flavors/default.md

@@ -0,0 +1,16 @@
+# Default
+## Specification
+| Control Plane | CNI    | Default OS   | Installs ClusterClass |
+|---------------|--------|--------------|-----------------------|
+| Kubeadm       | Cilium | Ubuntu 22.04 | No                    |
+## Prerequisites
+[Quickstart](../topics/getting-started.md) completed
+## Usage
+1. Generate cluster yaml
+    ```bash
+    clusterctl generate cluster test-cluster --infrastructure linode:0.0.0 --flavor clusterclass > test-cluster.yaml
+    ```
+2. Apply cluster yaml
+    ```bash
+    kubectl apply -f test-cluster.yaml
+    ```

docs/src/flavors/flavors.md

@@ -0,0 +1,20 @@
+# Flavors
+
+In `clusterctl` the infrastructure provider authors can provide different types
+of cluster templates referred to as "flavors". You can use the `--flavor` flag
+to specify which flavor to use for a cluster, e.g:
+
+```bash
+clusterctl generate cluster test-cluster --flavor clusterclass
+```
+
+To use the default flavor, omit the `--flavor` flag.
+
+See the [`clusterctl` flavors docs](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors) for more information.
+
+
+## Supported flavors 
+
+- [Default (kubeadm)](default.md)
+- [Cluster Class Kubeadm](clusterclass-kubeadm.md)
+- [k3s](k3s.md)

docs/src/flavors/k3s.md

@@ -0,0 +1,36 @@
+# K3s
+## Specification
+| Control Plane               | CNI    | Default OS   | Installs ClusterClass |
+|-----------------------------|--------|--------------|-----------------------|
+| [k3s](https://docs.k3s.io/) | Cilium | Ubuntu 22.04 | No                    |
+## Prerequisites
+* [Quickstart](../topics/getting-started.md) completed
+* Select a [k3s kubernetes version](https://github.com/k3s-io/k3s/releases) to set for the kubernetes version
+  ```bash
+  export KUBERNETES_VERSION=v1.29.1+k3s2
+  ```
+* Installed [k3s bootstrap provider](https://github.com/k3s-io/cluster-api-k3s) into your management cluster
+  * Add the following to `~/.cluster-api/clusterctl.yaml` for the k3s bootstrap/control plane providers
+    ```yaml
+    providers:
+      - name: "k3s"
+        url: https://github.com/k3s-io/cluster-api-k3s/releases/latest/bootstrap-components.yaml
+        type: "BootstrapProvider"
+      - name: "k3s"
+        url: https://github.com/k3s-io/cluster-api-k3s/releases/latest/control-plane-components.yaml
+        type: "ControlPlaneProvider"
+
+    ```
+  * Install the k3s provider into your management cluster
+    ```shell
+    clusterctl init --bootstrap k3s --control-plane k3s
+    ```
+## Usage
+1. Generate cluster yaml
+    ```bash
+    clusterctl generate cluster test-cluster --infrastructure linode:0.0.0 --flavor k3s > test-k3s-cluster.yaml
+    ```
+2. Apply cluster yaml
+    ```bash
+    kubectl apply -f test-k3s-cluster.yaml
+    ```

docs/src/topics/getting-started.md

@@ -17,14 +17,34 @@ For more information please see the
 [Linode Guide](https://www.linode.com/docs/products/tools/api/guides/manage-api-tokens/#create-an-api-token).
 ```
 
-## Setting up your Linode environment
+## Setting up your cluster environment variables
 
-Once you have provisioned your PAT, save it in an environment variable:
+Once you have provisioned your PAT, save it in an environment variable along with other required settings:
 ```bash
-export LINODE_TOKEN="<LinodePAT>"
+# Cluster settings
+export CLUSTER_NAME=capl-cluster
+export KUBERNETES_VERSION=v1.29.1
+
+# Linode settings
+export LINODE_REGION=us-ord
+export LINODE_TOKEN=<your linode PAT>
+export LINODE_CONTROL_PLANE_MACHINE_TYPE=g6-standard-2
+export LINODE_MACHINE_TYPE=g6-standard-2
 ```
 
-## Building your first cluster
+## Register linode locally as an infrastructure provider
+1. Generate local release files 
+    ```bash
+    make local-release
+    ```
+2. Add `linode` as an infrastructure provider in `~/.cluster-api/clusterctl.yaml`
+    ```yaml
+    providers:
+       - name: linode
+         url: ~/cluster-api-provider-linode/infrastructure-linode/0.0.0/infrastructure-components.yaml
+         type: InfrastructureProvider
+    ```
+
+## Deploying your first cluster
 
-Please continue from the [setting up the environment](../developers/development.md#setting-up-the-environment)
-section for creating your first Kubernetes cluster on Linode using Cluster API. 
+Please refer to the [default flavor](../flavors/default.md) section for creating your first Kubernetes cluster on Linode using Cluster API. 

e2e/linodevpc-controller/minimal/03-verify-vpc.yaml

@@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
   - script: |-
-      URI="vpcs" FILTER="{\"label\":\"CLi-$(OBJ=linodevpcs/linodevpc-sample make getKubeUid | sed 's/-//g')\"}" make callLinodeApiGet | grep 'results": 0'
+      URI="vpcs" FILTER="{\"label\":\"cli-$(OBJ=linodevpcs/linodevpc-sample make getKubeUid | sed 's/-//g')\"}" make callLinodeApiGet | grep 'results": 0'

templates/flavors/README.md

@@ -1,16 +1,8 @@
 # Flavors
 
-In `clusterctl` the infrastructure provider authors can provide different types
-of cluster templates referred to as "flavors". You can use the `--flavor` flag
-to specify which flavor to use for a cluster, e.g:
+## [Flavor usage documentation](https://linode.github.io/cluster-api-provider-linode/flavors/flavors.html)
 
-```shell
-clusterctl generate cluster test-cluster --flavor clusterclass
-```
-
-To use the default flavor, omit the `--flavor` flag.
-
-See the [`clusterctl` flavors docs](https://cluster-api.sigs.k8s.io/clusterctl/commands/generate-cluster.html#flavors) for more information.
+## Development
 
 This directory contains each of the flavors for CAPL. Each directory besides `base` will be used to
 create a flavor by running `kustomize build` on the directory. The name of the directory will be

templates/flavors/base/cluster.yaml

@@ -1,19 +1,18 @@
+---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
 metadata:
   name: ${CLUSTER_NAME}
   labels:
-    cni: cilium
-    ccm: linode
-    crs: ${CLUSTER_NAME}-crs
+    cluster: ${CLUSTER_NAME}
 spec:
   clusterNetwork:
     pods:
       cidrBlocks:
         - 192.168.128.0/17
   controlPlaneRef:
     apiVersion: controlplane.cluster.x-k8s.io/v1beta1
-    kind: KubeadmControlPlane
+    kind: REPLACEME
     name: ${CLUSTER_NAME}-control-plane
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1

templates/flavors/base/kustomization.yaml

@@ -1,7 +1,8 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - cluster.yaml
-  - kubeadm-control-plane.yaml
   - linode-cluster.yaml
   - linode-machine-template.yaml
+  - machine-deployment.yaml

templates/flavors/base/linode-machine-template.yaml

@@ -10,5 +10,19 @@ spec:
       type: ${LINODE_CONTROL_PLANE_MACHINE_TYPE}
       region: ${LINODE_REGION}
       authorizedKeys:
-# uncomment to include your ssh key in linode provisioning
-# - ${LINODE_SSH_PUBKEY:=""}
+      # uncomment to include your ssh key in linode provisioning
+      # - ${LINODE_SSH_PUBKEY:=""}
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: LinodeMachineTemplate
+metadata:
+  name: ${CLUSTER_NAME}-md-0
+spec:
+  template:
+    spec:
+      image: ${LINODE_OS:="linode/ubuntu22.04"}
+      type: ${LINODE_MACHINE_TYPE}
+      region: ${LINODE_REGION}
+      authorizedKeys:
+      # uncomment to include your ssh key in linode provisioning
+      # - ${LINODE_SSH_PUBKEY:=""}

templates/flavors/default/machine-deployment.yaml → templates/flavors/base/machine-deployment.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
 metadata:
@@ -15,7 +16,7 @@ spec:
         configRef:
           name: ${CLUSTER_NAME}-md-0
           apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-          kind: KubeadmConfigTemplate
+          kind: REPLACEME
       infrastructureRef:
         name: ${CLUSTER_NAME}-md-0
         apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1

templates/flavors/default/kustomization.yaml

@@ -1,9 +1,39 @@
 resources:
   - ../base
   - kubeadm-config-template.yaml
-  - linode-machine-template.yaml
-  - machine-deployment.yaml
+  - kubeadm-control-plane.yaml
   - ../../common-init-files
   - ../../addons/cilium
   - ../../addons/provider-linode
   - ../../addons/cluster-resource-set
+patches:
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: Cluster
+    patch: |-
+      - op: replace
+        path: /spec/controlPlaneRef/kind
+        value: KubeadmControlPlane
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: Cluster
+    patch: |-
+      apiVersion: cluster.x-k8s.io/v1beta1
+      kind: Cluster
+      metadata:
+        name: ${CLUSTER_NAME}
+        labels:
+            cni: cilium
+            ccm: linode
+            crs: ${CLUSTER_NAME}-crs
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: MachineDeployment
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/bootstrap/configRef/kind
+        value: KubeadmConfigTemplate
+

templates/flavors/k3s/k3sConfigTemplate.yaml

@@ -0,0 +1,18 @@
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: KThreesConfigTemplate
+metadata:
+  name: ${CLUSTER_NAME}-md-0
+spec:
+  template:
+    spec:
+      agentConfig:
+        nodeName: '{{ ds.meta_data.label }}'
+        kubeletArgs:
+          - "provider-id=linode://{{ ds.meta_data.id }}"
+      preK3sCommands:
+        - |
+          mkdir -p /etc/rancher/k3s/config.yaml.d/
+          echo "node-ip: $(hostname -I | grep -oE 192\.168\.[0-9]+\.[0-9]+)" >> /etc/rancher/k3s/config.yaml.d/capi-config.yaml
+        - sed -i '/swap/d' /etc/fstab
+        - swapoff -a

templates/flavors/k3s/k3sControlPlane.yaml

@@ -0,0 +1,50 @@
+---
+apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+kind: KThreesControlPlane
+metadata:
+  name: ${CLUSTER_NAME}-control-plane
+spec:
+  infrastructureTemplate:
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+    kind: LinodeMachineTemplate
+    name: ${CLUSTER_NAME}-control-plane
+  kthreesConfigSpec:
+    files:
+      - content: |
+          flannel-backend: none
+          disable-network-policy: true
+        owner: root:root
+        path: /etc/rancher/k3s/config.yaml.d/capi-config.yaml
+      - contentFrom:
+          secret:
+            key: cilium.yaml
+            name: linode-${CLUSTER_NAME}-crs-0
+        owner: root:root
+        path: /var/lib/rancher/k3s/server/manifests/cilium.yaml
+      - contentFrom:
+          secret:
+            key: linode-ccm.yaml
+            name: linode-${CLUSTER_NAME}-crs-0
+        owner: root:root
+        path: /var/lib/rancher/k3s/server/manifests/linode-ccm.yaml
+      - contentFrom:
+          secret:
+            key:  linode-token-region.yaml
+            name: linode-${CLUSTER_NAME}-crs-0
+        owner: root:root
+        path: /var/lib/rancher/k3s/server/manifests/linode-token-region.yaml
+    serverConfig:
+      disableComponents:
+        - servicelb
+        - traefik
+    agentConfig:
+      nodeName: '{{ ds.meta_data.label }}'
+      kubeletArgs:
+        - "provider-id=linode://{{ ds.meta_data.id }}"
+    preK3sCommands:
+      - |
+        echo "node-ip: $(hostname -I | grep -oE 192\.168\.[0-9]+\.[0-9]+)" >> /etc/rancher/k3s/config.yaml.d/capi-config.yaml
+      - sed -i '/swap/d' /etc/fstab
+      - swapoff -a
+  replicas: ${CONTROL_PLANE_MACHINE_COUNT}
+  version: ${KUBERNETES_VERSION}