Skip to content

Commit a429891

Browse files
BobyMCbobsBobyMCbobs
committed
Update kubevirt-talos
1 parent e43cac4 commit a429891

File tree

2 files changed

+29
-78
lines changed

2 files changed

+29
-78
lines changed

‎examples/templates/kubevirt-talos/README.org‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,27 @@ kubectl create -f https://github.com/kubevirt/containerized-data-importer/releas
1313
kubectl create -f https://github.com/kubevirt/containerized-data-importer/releases/download/$VERSION/cdi-cr.yaml
1414
#+end_src
1515

16+
#+RESULTS:
17+
#+begin_example
18+
namespace/cdi created
19+
customresourcedefinition.apiextensions.k8s.io/cdis.cdi.kubevirt.io created
20+
clusterrole.rbac.authorization.k8s.io/cdi-operator-cluster created
21+
clusterrolebinding.rbac.authorization.k8s.io/cdi-operator created
22+
serviceaccount/cdi-operator created
23+
role.rbac.authorization.k8s.io/cdi-operator created
24+
rolebinding.rbac.authorization.k8s.io/cdi-operator created
25+
deployment.apps/cdi-operator created
26+
configmap/cdi-operator-leader-election-helper created
27+
cdi.cdi.kubevirt.io/cdi created
28+
#+end_example
29+
1630
* Coder Iteration Loop
1731
** Start Coder
1832
#+begin_src tmate :window coder :dir "../../.."
1933

2034
cd ~/sharingio/coder
2135
rm -rf ~/.config/coderv2/ # delete database
22-
coder server --address=0.0.0.0:7080 --access-url=http://localhost:7080 --tunnel \
36+
coder server --address=0.0.0.0:7080 --access-url=http://localhost:7080 \
2337
2>&1 | tee coder-server.log
2438
#+end_src
2539
#+begin_src shell
@@ -29,10 +43,10 @@ coder login `cat ~/.config/coderv2/url` -u ii -p ii -e ii@ii.nz
2943
#+RESULTS:
3044
#+begin_example
3145
> Your Coder deployment hasn't been set up!
32-
33-
Welcome to Coder, ii! You're authenticated.
34-
35-
Get started by creating a template: coder templates init
46+
47+
Welcome to Coder, ii! You're authenticated.
48+
49+
Get started by creating a template: coder templates init
3650
#+end_example
3751
** coder url
3852
#+begin_src shell :dir "../../.."
@@ -54,9 +68,9 @@ export CRI_PATH=/var/run/containerd/containerd.sock
5468
export IMAGE_REPO=k8s.gcr.io
5569
export NODE_VM_IMAGE_TEMPLATE=quay.io/capk/ubuntu-2004-container-disk:v1.22.0
5670
coder template create kubevirt-talos \
57-
-d examples/templates/kubevirt-sidero-talos -
71+
-d examples/templates/kubevirt-talos \
5872
--yes
59-
coder create kv1 --template kubevirt-talos --parameter-file examples/templates/kubevirt/kubevirt.param.yaml --yes
73+
coder create kv1 --template kubevirt-talos
6074
#+end_src
6175

6276
** update template and new cluster

‎examples/templates/kubevirt-talos/cluster.tf‎

Lines changed: 8 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -135,30 +135,6 @@ resource "kubernetes_manifest" "kvcluster" {
135135
"type" = "ClusterIP"
136136
}
137137
}
138-
# "controlPlaneEndpoint" = {
139-
# "host" = ""
140-
# "port" = 0
141-
# }
142-
# "kubernetesVersion" = "1.23.4"
143-
# "helmRelease" = {
144-
# "chart" = {
145-
# "name" = null
146-
# "repo" = null
147-
# "version" = null
148-
# }
149-
# "values" = <<-EOT
150-
# service:
151-
# type: NodePort
152-
# securityContext:
153-
# runAsUser: 12345
154-
# runAsNonRoot: true
155-
# privileged: false
156-
# syncer:
157-
# extraArgs:
158-
# - --tls-san="${data.coder_workspace.me.name}.${var.base_domain}"
159-
# - --tls-san="${data.coder_workspace.me.name}.${data.coder_workspace.me.name}.svc"
160-
# EOT
161-
# }
162138
}
163139
}
164140
}
@@ -257,10 +233,11 @@ resource "kubernetes_manifest" "taloscontrolplane_talos_em_control_plane" {
257233
"op" = "replace"
258234
"path" = "/machine/install"
259235
"value" = {
260-
"bootloader" = true
261-
"disk" = "/dev/sda"
262-
"image" = "ghcr.io/siderolabs/installer:v1.2.4"
263-
"wipe" = false
236+
"bootloader" = true
237+
"disk" = "/dev/vda"
238+
"image" = "ghcr.io/siderolabs/installer:v1.2.4"
239+
"wipe" = false
240+
"extraKernelArgs" = ["console=ttyS0"]
264241
}
265242
},
266243
{
@@ -292,47 +269,6 @@ resource "kubernetes_manifest" "taloscontrolplane_talos_em_control_plane" {
292269
]
293270
"generateType" = "controlplane"
294271
}
295-
"init" = {
296-
"configPatches" = [
297-
{
298-
"op" = "replace"
299-
"path" = "/machine/install"
300-
"value" = {
301-
"bootloader" = true
302-
"disk" = "/dev/sda"
303-
"image" = "ghcr.io/siderolabs/installer:v1.2.4"
304-
"wipe" = false
305-
}
306-
},
307-
{
308-
"op" = "add"
309-
"path" = "/machine/kubelet/extraArgs"
310-
"value" = {
311-
"cloud-provider" = "external"
312-
}
313-
},
314-
{
315-
"op" = "add"
316-
"path" = "/cluster/apiServer/extraArgs"
317-
"value" = {
318-
"cloud-provider" = "external"
319-
}
320-
},
321-
{
322-
"op" = "add"
323-
"path" = "/cluster/controllerManager/extraArgs"
324-
"value" = {
325-
"cloud-provider" = "external"
326-
}
327-
},
328-
{
329-
"op" = "add"
330-
"path" = "/cluster/allowSchedulingOnMasters"
331-
"value" = true
332-
},
333-
]
334-
"generateType" = "init"
335-
}
336272
}
337273
"infrastructureTemplate" = {
338274
"apiVersion" = "infrastructure.cluster.x-k8s.io/v1alpha1"
@@ -347,7 +283,7 @@ resource "kubernetes_manifest" "taloscontrolplane_talos_em_control_plane" {
347283

348284
// TODO check resource cross references
349285

350-
Resource "kubernetes_manifest" "kubevirtmachinetemplate_md_0" {
286+
resource "kubernetes_manifest" "kubevirtmachinetemplate_md_0" {
351287
manifest = {
352288
"apiVersion" = "infrastructure.cluster.x-k8s.io/v1alpha1"
353289
"kind" = "KubevirtMachineTemplate"
@@ -441,7 +377,8 @@ resource "kubernetes_manifest" "talosconfigtemplate_talos_em_worker_a" {
441377
"spec" = {
442378
"template" = {
443379
"spec" = {
444-
"generateType" = "init"
380+
"generateType" = "join"
381+
"talosVersion" = "v1.2.4"
445382
}
446383
}
447384
}

0 commit comments

Comments
 (0)