.envrc

@@ -3,7 +3,5 @@ export KUBECONFIG="$(expand_path ./kubeconfig)"
 export SOPS_AGE_KEY_FILE="$(expand_path ./age.key)"
 export TALOSCONFIG="$(expand_path ./kubernetes/bootstrap/talos/clusterconfig/talosconfig)"
 export KREW_ROOT="$(expand_path ~/.krew/bin)";
-export CLUSTER="theshire"
-export KUBERNETES_DIR="$(expand_path ./kubernetes)"
 PATH_add $KREW_ROOT
 use nix

.taskfiles/talos/Taskfile.yaml

@@ -2,12 +2,6 @@
 # yaml-language-server: $schema=https://taskfile.dev/schema.json
 version: "3"
 
-vars:
-  RESOURCES_DIR: "{{.ROOT_DIR}}/.taskfiles/talos/resources"
-  CONTROLLER:
-    sh: talosctl --context {{.cluster}} config info --output json | jq --raw-output '.endpoints[]' | shuf -n 1
-  cluster: theshire
-
 tasks:
   bootstrap:
     desc: Bootstrap Talos
@@ -15,11 +9,11 @@ tasks:
       Args:
         cluster: Cluster to run command against (default: theshire)
         controller: Controller node to run command against (required) (IP/DNS)
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
     prompt: Bootstrap Talos on the cluster... continue?
     cmds:
       - task: bootstrap-etcd
         vars: &vars
+          cluster: '{{.cluster | default "theshire"}}'
           controller: "{{.controller}}"
       - task: fetch-kubeconfig
         vars: *vars
@@ -31,44 +25,56 @@ tasks:
 
   bootstrap-etcd:
     desc: Bootstrap Etcd
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
+    cmd: until talosctl --context {{.cluster}} --nodes {{.controller}} bootstrap; do sleep 10; done
-    cmd: until talosctl --context $CLUSTER --nodes {{.controller}} bootstrap; do sleep 10; done
     requires:
       vars:
+        - cluster
         - controller
 
   bootstrap-integrations:
     desc: Bootstrap core integrations needed for Talos
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
     cmds:
-      - until kubectl --context $CLUSTER wait --for=condition=Ready=False nodes --all --timeout=600s; do sleep 10; done
+      - until kubectl --context {{.cluster}} wait --for=condition=Ready=False nodes --all --timeout=600s; do sleep 10; done
-      - helmfile --kube-context $CLUSTER --file {{.KUBERNETES_DIR}}/bootstrap/helmfile.yaml apply --skip-diff-on-install --suppress-diff
+      - helmfile --kube-context {{.cluster}} --file {{.KUBERNETES_DIR}}/bootstrap/helmfile.yaml apply --skip-diff-on-install --suppress-diff
-      - until kubectl --context $CLUSTER wait --for=condition=Ready nodes --all --timeout=600s; do sleep 10; done
+      - until kubectl --context {{.cluster}} wait --for=condition=Ready nodes --all --timeout=600s; do sleep 10; done
+    requires:
+      vars:
+        - cluster
     preconditions:
       - which helmfile
-      - sh: kubectl config get-contexts $CLUSTER
+      - sh: kubectl config get-contexts {{.cluster}}
-        msg: "Kubectl context $CLUSTER not found"
+        msg: "Kubectl context {{.cluster}} not found"
       - test -f {{.KUBERNETES_DIR}}/bootstrap/helmfile.yaml
 
   fetch-kubeconfig:
     desc: Fetch kubeconfig from Talos controllers
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
+    vars:
-    env: *vars
+      CONTROLPLANE_NODE:
+        sh: |
+          talosctl --context {{.cluster}} config info \
+          | grep Endpoints: \
+          | awk '{split($0,u," "); print u[2]}' \
+          | sed -E 's/,//'
     cmd: |
-      talosctl --context $CLUSTER kubeconfig --nodes {{ .CONTROLLER }} \
+      talosctl --context {{.cluster}} kubeconfig --nodes {{.CONTROLPLANE_NODE}} \
-          --force --force-context-name $CLUSTER {{.ROOT_DIR}}/kubeconfig
+          --force --force-context-name {{.cluster}} {{.ROOT_DIR}}/kubeconfig
+    requires:
+      vars:
+        - cluster
     preconditions:
-      - talosctl config get-contexts | grep $CLUSTER
+      - talosctl config get-contexts | grep {{.cluster}}
 
   generate-clusterconfig:
     desc: Generate clusterconfig for Talos
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
     cmds:
       - talhelper genconfig
         --env-file {{.KUBERNETES_DIR}}/bootstrap/talos/talenv.sops.yaml
         --secret-file {{.KUBERNETES_DIR}}/bootstrap/talos/talsecret.sops.yaml
         --config-file {{.KUBERNETES_DIR}}/bootstrap/talos/talconfig.yaml
         --out-dir {{.KUBERNETES_DIR}}/bootstrap/talos/clusterconfig
+    requires:
+      vars:
+        - cluster
     preconditions:
       - which talhelper
       - test -f {{.KUBERNETES_DIR}}/bootstrap/talos/talenv.sops.yaml
@@ -77,7 +83,6 @@ tasks:
 
   upgrade:
     desc: Upgrade Talos version for a node
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
     vars:
       TALOS_VERSION:
         sh: |
@@ -88,13 +93,14 @@ tasks:
             --env-file {{.KUBERNETES_DIR}}/bootstrap/talos/talenv.sops.yaml \
             --config-file {{.KUBERNETES_DIR}}/bootstrap/talos/talconfig.yaml
     cmds:
-      - talosctl --context $CLUSTER upgrade -n {{.node}} --image {{.TALOS_IMAGE }}
+      - talosctl --context {{.cluster}} upgrade -n {{.node}} --image {{.TALOS_IMAGE }}
     requires:
       vars:
+        - cluster
         - node
     preconditions:
       - which talhelper
-      - talosctl config get-contexts | grep $CLUSTER
+      - talosctl config get-contexts | grep {{.cluster}}
       - test -f {{.KUBERNETES_DIR}}/bootstrap/talos/talenv.sops.yaml
       - test -f {{.KUBERNETES_DIR}}/bootstrap/talos/talconfig.yaml
       - msg: "Talos image could not be determined for {{.node}}"
@@ -102,32 +108,33 @@ tasks:
 
   upgrade-k8s:
     desc: Upgrade Kubernetes version for a Talos cluster
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
     vars:
       KUBERNETES_VERSION:
         sh: |
           yq -r ".kubernetesVersion" {{.KUBERNETES_DIR}}/bootstrap/talos/talconfig.yaml
       CONTROLPLANE_NODE:
         sh: |
-          talosctl --context $CLUSTER config info \
+          talosctl --context theshire config info \
           | grep Endpoints: \
           | awk '{split($0,u," "); print u[2]}' \
           | sed -E 's/,//'
     cmds:
       - talosctl upgrade-k8s -n {{.CONTROLPLANE_NODE}} --to {{.KUBERNETES_VERSION}}
+    requires:
+      vars:
+        - cluster
     preconditions:
       - which talhelper
-      - talosctl config get-contexts | grep $CLUSTER
+      - talosctl config get-contexts | grep {{.cluster}}
       - test -f {{.KUBERNETES_DIR}}/bootstrap/talos/talenv.sops.yaml
       - test -f {{.KUBERNETES_DIR}}/bootstrap/talos/talconfig.yaml
-      - msg: "Kubernetes version could not be determined for cluster $CLUSTER"
+      - msg: "Kubernetes version could not be determined for cluster {{.cluster}}"
         sh: 'test -n "{{.KUBERNETES_VERSION}}"'
-      - msg: "Control plane node could not be determined for cluster $CLUSTER"
+      - msg: "Control plane node could not be determined for cluster {{.cluster}}"
         sh: 'test -n "{{.CONTROLPLANE_NODE}}"'
 
   apply-clusterconfig:
     desc: Apply clusterconfig for a Talos cluster
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
     vars:
       CLUSTERCONFIG_FILES:
         sh: find {{.KUBERNETES_DIR}}/bootstrap/talos/clusterconfig -type f -name '*.yaml' -printf '%f\n'
@@ -136,31 +143,32 @@ tasks:
           var: CLUSTERCONFIG_FILES
         task: _apply-machineconfig
         vars:
+          cluster: "{{ .cluster }}"
           filename: "{{.ITEM}}"
           hostname: |-
             {{ trimPrefix (printf "%s-" .cluster) .ITEM | trimSuffix ".yaml" }}
           dry_run: "{{ .dry_run }}"
+    requires:
+      vars:
+        - cluster
     preconditions:
-      - talosctl config get-contexts | grep $CLUSTER
+      - talosctl config get-contexts | grep {{.cluster}}
       - test -d {{.KUBERNETES_DIR}}/bootstrap/talos/clusterconfig
 
   _apply-machineconfig:
     internal: true
     desc: Apply a single Talos machineConfig to a Talos node
-    dotenv: ["{{.RESOURCES_DIR}}/.env"]
     cmds:
-      - talosctl --context theshire apply-config
+      - talosctl --context {{.cluster}} apply-config
         --nodes "{{.hostname}}"
         --file "{{.KUBERNETES_DIR}}/bootstrap/talos/clusterconfig/{{.filename}}"
         {{ if eq "true" .dry_run }}--dry-run{{ end }}
         #--insecure
     requires:
       vars:
+        - cluster
         - hostname
         - filename
     preconditions:
-      - talosctl config get-contexts | grep $CLUSTER
+      - talosctl config get-contexts | grep {{.cluster}}
       - test -f {{.KUBERNETES_DIR}}/bootstrap/talos/clusterconfig/{{.filename}}
-  version:
-    desc: Show Talos version
-    cmd: talosctl version

.taskfiles/talos/resources/.env

@@ -1 +0,0 @@
-CLUSTER=theshire

kubernetes/bootstrap/talos/clusterconfig/.gitignore

@@ -6,4 +6,3 @@ theshire-merry.yaml
 theshire-rosie.yaml
 talosconfig
 theshire-gandalf-01.yaml
-theshire-shadowfax-01.yaml

kubernetes/bootstrap/talos/talconfig.yaml

@@ -116,47 +116,6 @@ nodes:
         machine:
           sysctls:
             vm.nr_hugepages: "1024"
-      - &kubelet_extra_mounts |-
-        machine:
-          kubelet:
-            extraMounts:
-              - destination: /var/openebs/local
-                type: bind
-                source: /var/openebs/local
-                options:
-                  - bind
-                  - rshared
-                  - rw
-  - hostname: shadowfax-01
-    disableSearchDomain: true
-    ipAddress: 10.1.1.69
-    controlPlane: false
-    installDiskSelector:
-      busPath: /pci0000:00/0000:00:01.1/0000:02:00.0/virtio6/host0/target0:0:0/0:0:0:1/
-    networkInterfaces:
-      - interface: enp5s0
-        dhcp: true
-    patches:
-      - |-
-        machine:
-          sysctls:
-            net.core.bpf_jit_harden: 1
-            vm.nr_hugepages: "1024"
-      - *kubelet_extra_mounts
-
-    kernelModules:
-      - name: nvidia
-      - name: nvidia_uvm
-      - name: nvidia_drm
-      - name: nvidia_modeset
-    schematic:
-      customization:
-        systemExtensions:
-          officialExtensions:
-            - siderolabs/amd-ucode
-            - siderolabs/nonfree-kmod-nvidia
-            - siderolabs/nvidia-container-toolkit
-
 worker:
   schematic:
     customization: