Skip to content

Commit 09187f1

Browse files
authored
Use k3s release 0.1.8 (#5)
* Disable cloud-provider=external on k3s templates Signed-off-by: Andrea Mazzotti <[email protected]> * Update elemental-agent and k3s provider versions Signed-off-by: Andrea Mazzotti <[email protected]>
1 parent 302ec4a commit 09187f1

File tree

3 files changed

+17
-34
lines changed

3 files changed

+17
-34
lines changed

doc/QUICKSTART.md

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,21 @@
8383
cat << EOF > $HOME/.cluster-api/clusterctl.yaml
8484
providers:
8585
- name: "elemental"
86-
url: "https://github.com/rancher-sandbox/cluster-api-provider-elemental/releases/v0.0.1/infrastructure-components.yaml"
86+
url: "https://github.com/rancher-sandbox/cluster-api-provider-elemental/releases/v0.0.2/infrastructure-components.yaml"
8787
type: "InfrastructureProvider"
88+
- name: "k3s"
89+
url: "https://github.com/cluster-api-provider-k3s/cluster-api-k3s/releases/v0.1.8/bootstrap-components.yaml"
90+
type: "BootstrapProvider"
91+
- name: "k3s"
92+
url: "https://github.com/cluster-api-provider-k3s/cluster-api-k3s/releases/v0.1.8/control-plane-components.yaml"
93+
type: "ControlPlaneProvider"
8894
EOF
8995
```
9096
91-
1. Install CAPI Core provider and the Elemental Infrastructure provider:
92-
93-
```bash
94-
clusterctl init --bootstrap "-" --control-plane "-" --infrastructure elemental:v0.0.1
95-
```
96-
97-
1. Install the **k3s** bootstrap and control plane providers:
98-
99-
**Note**: This is a workaround for the current [issue](https://github.com/cluster-api-provider-k3s/cluster-api-k3s/issues/55) using `clusterctl init`.
97+
1. Install CAPI Core provider, the k3s Control Plane and Bootstrap providers, and the Elemental Infrastructure provider:
10098
10199
```bash
102-
kubectl apply -f https://github.com/cluster-api-provider-k3s/cluster-api-k3s/releases/download/v0.1.7/bootstrap-components.yaml
103-
kubectl apply -f https://github.com/cluster-api-provider-k3s/cluster-api-k3s/releases/download/v0.1.7/control-plane-components.yaml
100+
clusterctl init --bootstrap k3s:v0.1.8 --control-plane k3s:v0.1.8 --infrastructure elemental:v0.0.2
104101
```
105102
106103
1. Expose the Elemental API server:
@@ -135,7 +132,7 @@
135132
136133
```bash
137134
CONTROL_PLANE_ENDPOINT_IP=192.168.122.100 clusterctl generate cluster \
138-
--infrastructure elemental:v0.0.1 \
135+
--infrastructure elemental:v0.0.2 \
139136
--flavor k3s-single-node \
140137
--kubernetes-version v1.28.2 \
141138
elemental-cluster-k3s > $HOME/elemental-cluster-k3s.yaml
@@ -176,7 +173,7 @@ For more information on how to configure and use the agent, please read the [doc
176173
1. Install the agent:
177174
178175
```bash
179-
curl -L https://github.com/rancher-sandbox/cluster-api-provider-elemental/releases/download/v0.0.1/elemental_agent_linux_amd64 -o elemental-agent
176+
curl -L https://github.com/rancher-sandbox/cluster-api-provider-elemental/releases/download/v0.0.2/elemental_agent_linux_amd64 -o elemental-agent
180177
install -o root -g root -m 0755 elemental-agent /usr/local/sbin/elemental-agent
181178
```
182179
@@ -247,23 +244,3 @@ The `k3s` components also need to be deleted.
247244
248245
hostnamectl set-hostname my-bare-metal-host
249246
```
250-
251-
<!-- This part is not really working yet: https://github.com/cluster-api-provider-k3s/cluster-api-k3s/issues/55 -->
252-
<!-- 1. Configure `clusterctl` to use the custom providers:
253-
254-
```bash
255-
mkdir -p $HOME/.cluster-api
256-
257-
cat << EOF > $HOME/.cluster-api/clusterctl.yaml
258-
providers:
259-
- name: "elemental"
260-
url: "https://github.com/rancher-sandbox/cluster-api-provider-elemental/releases/v0.0.1/infrastructure-components.yaml"
261-
type: "InfrastructureProvider"
262-
- name: "k3s"
263-
url: "https://github.com/cluster-api-provider-k3s/cluster-api-k3s/releases/v0.1.7/bootstrap-components.yaml"
264-
type: "BootstrapProvider"
265-
- name: "k3s"
266-
url: "https://github.com/cluster-api-provider-k3s/cluster-api-k3s/releases/v0.1.7/control-plane-components.yaml"
267-
type: "ControlPlaneProvider"
268-
EOF
269-
``` -->

infrastructure-elemental/v0.0.0/cluster-template-k3s-single-node.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ spec:
3434
name: ${CLUSTER_NAME}-control-plane
3535
replicas: 1
3636
version: ${KUBERNETES_VERSION}+k3s1
37+
kthreesConfigSpec:
38+
serverConfig:
39+
disableExternalCloudProvider: true
3740
---
3841
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
3942
kind: ElementalCluster

infrastructure-elemental/v0.0.0/cluster-template-k3s.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ spec:
7070
name: ${CLUSTER_NAME}-control-plane
7171
replicas: 1
7272
version: ${KUBERNETES_VERSION}+k3s1
73+
kthreesConfigSpec:
74+
serverConfig:
75+
disableExternalCloudProvider: true
7376
---
7477
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
7578
kind: ElementalCluster

0 commit comments

Comments
 (0)