Revert "feat: k8s group, renovate sops, ignore sops mac, less jank"

This reverts commit 4c89e28.
onedr0p · Jun 2, 2024 · d827a06 · d827a06
1 parent 4c89e28
commit d827a06
Show file tree

Hide file tree

Showing 17 changed files with 81 additions and 92 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -25,7 +25,7 @@
   "suppressNotifications": ["prEditedNotification", "prIgnoreNotification"],
   "onboarding": false,
   "requireConfig": "ignored",
-  "ignorePaths": ["**/resources/**"],
+  "ignorePaths": ["**/*.sops.*", "**/.archive/**", "**/resources/**"],
   "flux": {
     "fileMatch": [
       "(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"

diff --git a/.github/renovate/groups.json5 b/.github/renovate/groups.json5
@@ -33,30 +33,14 @@
       "separateMinorPatch": true
     },
     {
-      "description": ["Intel Device Plugins Group"],
-      "groupName": "Intel-Device-Plugins",
-      "matchPackagePatterns": ["intel-device-plugins"],
-      "matchDatasources": ["helm"],
-      "group": {
-        "commitMessageTopic": "{{{groupName}}} group"
+      description: ["Intel Device Plugins Group"],
+      groupName: "Intel-Device-Plugins",
+      matchPackagePatterns: ["intel-device-plugins"],
+      matchDatasources: ["helm"],
+      group: {
+        commitMessageTopic: "{{{groupName}}} group",
       },
-      "separateMinorPatch": true
-    },
-    {
-      "description": ["Kubernetes Group"],
-      "groupName": "Kubernetes",
-      "matchPackagePatterns": [
-        "ghcr.io/siderolabs/kubelet",
-        "registry.k8s.io/kube-apiserver",
-        "registry.k8s.io/kube-controller-manager",
-        "registry.k8s.io/kube-proxy",
-        "registry.k8s.io/kube-scheduler"
-      ],
-      "matchDatasources": ["docker"],
-      "group": {
-        "commitMessageTopic": "{{{groupName}}} group"
-      },
-      "separateMinorPatch": true
+      separateMinorPatch: true,
     },
     {
       "description": ["Rook-Ceph Group"],
@@ -72,9 +56,8 @@
       "description": ["Talos Group"],
       "groupName": "Talos",
       "matchPackagePatterns": [
-        "ghcr.io/siderolabs/talosctl",
-        "ghcr.io/siderolabs/installer",
-        "factory.talos.dev/installer"
+        "siderolabs/talosctl",
+        "siderolabs/installer"
       ],
       "matchDatasources": ["docker"],
       "group": {

diff --git a/.taskfiles/Talos/Taskfile.yaml b/.taskfiles/Talos/Taskfile.yaml
@@ -2,6 +2,14 @@
 # yaml-language-server: $schema=https://taskfile.dev/schema.json
 version: "3"
 
+x-env-vars: &env-vars
+  TALOS_VERSION:
+    sh: yq 'select(document_index == 1).spec.postBuild.substitute.TALOS_VERSION' {{.KUBERNETES_DIR}}/{{.cluster}}/apps/system-upgrade/system-upgrade-controller/ks.yaml
+  TALOS_SCHEMATIC_ID:
+    sh: yq 'select(document_index == 1).spec.postBuild.substitute.TALOS_SCHEMATIC_ID' {{.KUBERNETES_DIR}}/{{.cluster}}/apps/system-upgrade/system-upgrade-controller/ks.yaml
+  KUBERNETES_VERSION:
+    sh: yq 'select(document_index == 1).spec.postBuild.substitute.KUBERNETES_VERSION' {{.KUBERNETES_DIR}}/{{.cluster}}/apps/system-upgrade/system-upgrade-controller/ks.yaml
+
 vars:
   # Ref: https://github.com/onedr0p/home-service
   HOME_SERVICE_ADDR: voyager.internal
@@ -65,8 +73,10 @@ tasks:
   apply-config:
     desc: Apply Talos configuration to a node
     cmd: |
-      sops --decrypt --ignore-mac {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/assets/{{.hostname}}.secret.sops.yaml | \
-          talosctl --context {{.cluster}} apply-config --mode={{.mode}} --nodes {{.node}} --file /dev/stdin
+      sops -d {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/assets/{{.hostname}}.secret.sops.yaml | \
+          envsubst | \
+              talosctl --context {{.cluster}} apply-config --mode={{.mode}} --nodes {{.node}} --file /dev/stdin
+    env: *env-vars
     vars:
       mode: '{{.mode | default "no-reboot"}}'
       hostname:
@@ -82,14 +92,10 @@ tasks:
     desc: Upgrade Talos on a node
     cmds:
       - until kubectl --context {{.cluster}} wait --timeout=5m --for=condition=Complete jobs --all --all-namespaces; do sleep 10; done
-      - talosctl --context {{.cluster}} --nodes {{.node}} upgrade --image="{{.image}}" --wait=true --timeout=10m --preserve=true
+      - talosctl --context {{.cluster}} --nodes {{.node}} upgrade --image="factory.talos.dev/installer/{{.TALOS_SCHEMATIC_ID}}:{{.TALOS_VERSION}}" --wait=true --timeout=10m --preserve=true
       - talosctl --context {{.cluster}} --nodes {{.node}} health --wait-timeout=10m --server=false
       - until kubectl --context {{.cluster}} wait --timeout=5m --for=jsonpath=.status.ceph.health=HEALTH_OK cephcluster --all --all-namespaces; do sleep 10; done
-    vars:
-      hostname:
-        sh: talosctl --context {{.cluster}} --nodes {{.node}} get machineconfig -o jsonpath='{.spec.machine.network.hostname}'
-      image:
-        sh: yq '.machine.install.image' {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/assets/{{.hostname}}.secret.sops.yaml
+    vars: *env-vars
     requires:
       vars: ["cluster", "node"]
     preconditions:
@@ -101,12 +107,8 @@ tasks:
     desc: Upgrade Kubernetes on a controller node
     cmds:
       - until kubectl --context {{.cluster}} wait --timeout=5m --for=condition=Complete jobs --all --all-namespaces; do sleep 10; done
-      - talosctl --context {{.cluster}} --nodes {{.controller}} upgrade-k8s --to {{.version}}
-    vars:
-      hostname:
-        sh: talosctl --context {{.cluster}} --nodes {{.controller}} get machineconfig -o jsonpath='{.spec.machine.network.hostname}'
-      version:
-        sh: yq '.machine.kubelet.image' {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/assets/{{.hostname}}.secret.sops.yaml | sed 's/^[^:]*://'
+      - talosctl --context {{.cluster}} --nodes {{.controller}} upgrade-k8s --to {{.KUBERNETES_VERSION}}
+    vars: *env-vars
     requires:
       vars: ["cluster", "controller"]
     preconditions:
@@ -142,24 +144,15 @@ tasks:
   bootstrap-matchbox:
     desc: Bootstrap required Matchbox configuration to PXE Boot machine
     cmds:
-      - for: { var: nodes, split: ',' }
+      - for: ["kernel-amd64", "initramfs-amd64.xz"]
         cmd: |
-          hostname="$(talosctl --context {{.cluster}} --nodes {{.ITEM}} get machineconfig -o jsonpath='{.spec.machine.network.hostname}')"
-          image="$(yq '.machine.install.image' {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/assets/${hostname}.secret.sops.yaml)"
-          image="${image/installer/image}"
-          image="${image/://}"
-          curl -skL https://${image}/kernel-amd64 | \
-              curl -skT - -u "{{.HOME_SERVICE_USER}}:" \
-                  sftp://{{.HOME_SERVICE_ADDR}}/{{.HOME_SERVICE_MATCHBOX_DIR}}/assets/${hostname}.kernel-amd64
-          curl -skL https://${image}/initramfs-amd64.xz | \
+          curl -skL https://factory.talos.dev/image/{{.TALOS_SCHEMATIC_ID}}/{{.TALOS_VERSION}}/{{.ITEM}} | \
               curl -skT - -u "{{.HOME_SERVICE_USER}}:" \
-                  sftp://{{.HOME_SERVICE_ADDR}}/{{.HOME_SERVICE_MATCHBOX_DIR}}/assets/${hostname}.initramfs-amd64.xz
-      - find {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/assets -type f | xargs -I{} sh -c "sops --decrypt --ignore-mac {} | curl -skT - -u "{{.HOME_SERVICE_USER}}:" sftp://{{.HOME_SERVICE_ADDR}}/{{.HOME_SERVICE_MATCHBOX_DIR}}/assets/\$(basename {} | sed 's/\.secret\.sops//')"
+                  sftp://{{.HOME_SERVICE_ADDR}}/{{.HOME_SERVICE_MATCHBOX_DIR}}/assets/{{.ITEM}}
+      - find {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/assets -type f | xargs -I{} sh -c "sops -d {} | envsubst | curl -skT - -u "{{.HOME_SERVICE_USER}}:" sftp://{{.HOME_SERVICE_ADDR}}/{{.HOME_SERVICE_MATCHBOX_DIR}}/assets/\$(basename {} | sed 's/\.secret\.sops//')"
       - find {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/groups -type f | xargs -I{} curl -skT {} -u "{{.HOME_SERVICE_USER}}:" sftp://{{.HOME_SERVICE_ADDR}}/{{.HOME_SERVICE_MATCHBOX_DIR}}/groups/
       - find {{.KUBERNETES_DIR}}/{{.cluster}}/bootstrap/talos/profiles -type f | xargs -I{} curl -skT {} -u "{{.HOME_SERVICE_USER}}:" sftp://{{.HOME_SERVICE_ADDR}}/{{.HOME_SERVICE_MATCHBOX_DIR}}/profiles/
       - ssh -l {{.HOME_SERVICE_USER}} {{.HOME_SERVICE_ADDR}} "cd /var/opt/home-service ; go-task restart-matchbox"
-    vars:
-      nodes:
-        sh: talosctl --context {{.cluster}} config info --output json | jq --join-output '[.nodes[]] | join(",")'
+    vars: *env-vars
     requires:
       vars: ["cluster"]
diff --git a/kubernetes/main/apps/system-upgrade/system-upgrade-controller/ks.yaml b/kubernetes/main/apps/system-upgrade/system-upgrade-controller/ks.yaml
@@ -46,6 +46,7 @@ spec:
   timeout: 5m
   postBuild:
     substitute:
+      TALOS_SCHEMATIC_ID: d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100
       # renovate: datasource=docker depName=ghcr.io/siderolabs/installer
       TALOS_VERSION: v1.7.4
       # renovate: datasource=docker depName=ghcr.io/siderolabs/kubelet

diff --git a/kubernetes/main/apps/system-upgrade/system-upgrade-controller/plans/talos.yaml b/kubernetes/main/apps/system-upgrade/system-upgrade-controller/plans/talos.yaml
@@ -43,6 +43,6 @@ spec:
     args:
       - --nodes=$(NODE_IP)
       - upgrade
-      - --image=factory.talos.dev/installer/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100:$(SYSTEM_UPGRADE_PLAN_LATEST_VERSION)
+      - --image=factory.talos.dev/installer/${TALOS_SCHEMATIC_ID}:$(SYSTEM_UPGRADE_PLAN_LATEST_VERSION)
       - --preserve=true
       - --wait=false
diff --git a/kubernetes/main/bootstrap/talos/assets/k8s-0.secret.sops.yaml b/kubernetes/main/bootstrap/talos/assets/k8s-0.secret.sops.yaml
@@ -11,7 +11,7 @@ machine:
         - 127.0.0.1
         - 192.168.42.120
     kubelet:
-        image: ghcr.io/siderolabs/kubelet:v1.30.1
+        image: ghcr.io/siderolabs/kubelet:${KUBERNETES_VERSION}
         extraArgs:
             rotate-server-certificates: "true"
         extraMounts:
@@ -43,7 +43,7 @@ machine:
         extraKernelArgs:
             - mitigations=off
             - module_blacklist=e1000e
-        image: factory.talos.dev/installer/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100:v1.7.4
+        image: factory.talos.dev/installer/${TALOS_SCHEMATIC_ID}:${TALOS_VERSION}
         wipe: false
     files:
         - content: |-
@@ -132,7 +132,7 @@ cluster:
     serviceAccount:
         key: ENC[AES256_GCM,data:+ba4VgXnvv1aIdlnAlxDUtJhunMGuWelO4mTVf5wYYLB4Z75mmlarqbMJS9tbbVTm77KBtvmaH4nq5Z451fTYav4BUTzbiSspjdGOTsDvuiGvYtqOv1YGirrN8EzhWT6ilRsNNJlOiUyaFKhk+jqpUntei+CuTd2yzUQNPSVBOXlBXv0fihN4PKkViWPWoQw3X7Y7EvBtAZaVB9GU5Z2ddY3RHSsdTAyQ0VIvox2EjWaaOSIT43FAmtvMppITaCDuGrC0uwZeV81Y3U1vjd3sPKbbSouw2Aby2D/JXGSc7lGady8LbhMYxkOkdpMU9Z2SMpUeNglkL+zPw1sok0aerGL8IaFVuMS1ELqM5qQ2hfwUV/9dIkFlroy63hJgzJcwXTVlPZH0KVQZShwlnYslQ==,iv:V4qY602uIEncTDxZV6haItGVCvTwWLtW/2gvvUwbUKo=,tag:B0EcO7s9FfGoZ+ZjKshXiw==,type:str]
     apiServer:
-        image: registry.k8s.io/kube-apiserver:v1.30.1
+        image: registry.k8s.io/kube-apiserver:${KUBERNETES_VERSION}
         certSANs:
             - 127.0.0.1
             - 192.168.42.120
@@ -143,14 +143,14 @@ cluster:
             rules:
                 - level: Metadata
     controllerManager:
-        image: registry.k8s.io/kube-controller-manager:v1.30.1
+        image: registry.k8s.io/kube-controller-manager:${KUBERNETES_VERSION}
         extraArgs:
             bind-address: 0.0.0.0
     proxy:
         disabled: true
-        image: registry.k8s.io/kube-proxy:v1.30.1
+        image: registry.k8s.io/kube-proxy:${KUBERNETES_VERSION}
     scheduler:
-        image: registry.k8s.io/kube-scheduler:v1.30.1
+        image: registry.k8s.io/kube-scheduler:${KUBERNETES_VERSION}
         extraArgs:
             bind-address: 0.0.0.0
     discovery:

diff --git a/kubernetes/main/bootstrap/talos/assets/k8s-1.secret.sops.yaml b/kubernetes/main/bootstrap/talos/assets/k8s-1.secret.sops.yaml
@@ -11,7 +11,7 @@ machine:
         - 127.0.0.1
         - 192.168.42.120
     kubelet:
-        image: ghcr.io/siderolabs/kubelet:v1.30.1
+        image: ghcr.io/siderolabs/kubelet:${KUBERNETES_VERSION}
         extraArgs:
             rotate-server-certificates: "true"
         extraMounts:
@@ -43,7 +43,7 @@ machine:
         extraKernelArgs:
             - mitigations=off
             - module_blacklist=e1000e
-        image: factory.talos.dev/installer/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100:v1.7.4
+        image: factory.talos.dev/installer/${TALOS_SCHEMATIC_ID}:${TALOS_VERSION}
         wipe: false
     files:
         - content: |-
@@ -132,7 +132,7 @@ cluster:
     serviceAccount:
         key: ENC[AES256_GCM,data:+ba4VgXnvv1aIdlnAlxDUtJhunMGuWelO4mTVf5wYYLB4Z75mmlarqbMJS9tbbVTm77KBtvmaH4nq5Z451fTYav4BUTzbiSspjdGOTsDvuiGvYtqOv1YGirrN8EzhWT6ilRsNNJlOiUyaFKhk+jqpUntei+CuTd2yzUQNPSVBOXlBXv0fihN4PKkViWPWoQw3X7Y7EvBtAZaVB9GU5Z2ddY3RHSsdTAyQ0VIvox2EjWaaOSIT43FAmtvMppITaCDuGrC0uwZeV81Y3U1vjd3sPKbbSouw2Aby2D/JXGSc7lGady8LbhMYxkOkdpMU9Z2SMpUeNglkL+zPw1sok0aerGL8IaFVuMS1ELqM5qQ2hfwUV/9dIkFlroy63hJgzJcwXTVlPZH0KVQZShwlnYslQ==,iv:V4qY602uIEncTDxZV6haItGVCvTwWLtW/2gvvUwbUKo=,tag:B0EcO7s9FfGoZ+ZjKshXiw==,type:str]
     apiServer:
-        image: registry.k8s.io/kube-apiserver:v1.30.1
+        image: registry.k8s.io/kube-apiserver:${KUBERNETES_VERSION}
         certSANs:
             - 127.0.0.1
             - 192.168.42.120
@@ -143,14 +143,14 @@ cluster:
             rules:
                 - level: Metadata
     controllerManager:
-        image: registry.k8s.io/kube-controller-manager:v1.30.1
+        image: registry.k8s.io/kube-controller-manager:${KUBERNETES_VERSION}
         extraArgs:
             bind-address: 0.0.0.0
     proxy:
         disabled: true
-        image: registry.k8s.io/kube-proxy:v1.30.1
+        image: registry.k8s.io/kube-proxy:${KUBERNETES_VERSION}
     scheduler:
-        image: registry.k8s.io/kube-scheduler:v1.30.1
+        image: registry.k8s.io/kube-scheduler:${KUBERNETES_VERSION}
         extraArgs:
             bind-address: 0.0.0.0
     discovery:

diff --git a/kubernetes/main/bootstrap/talos/assets/k8s-2.secret.sops.yaml b/kubernetes/main/bootstrap/talos/assets/k8s-2.secret.sops.yaml
@@ -11,7 +11,7 @@ machine:
         - 127.0.0.1
         - 192.168.42.120
     kubelet:
-        image: ghcr.io/siderolabs/kubelet:v1.30.1
+        image: ghcr.io/siderolabs/kubelet:${KUBERNETES_VERSION}
         extraArgs:
             rotate-server-certificates: "true"
         extraMounts:
@@ -43,7 +43,7 @@ machine:
         extraKernelArgs:
             - mitigations=off
             - module_blacklist=e1000e
-        image: factory.talos.dev/installer/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100:v1.7.4
+        image: factory.talos.dev/installer/${TALOS_SCHEMATIC_ID}:${TALOS_VERSION}
         wipe: false
     files:
         - content: |-
@@ -132,7 +132,7 @@ cluster:
     serviceAccount:
         key: ENC[AES256_GCM,data:+ba4VgXnvv1aIdlnAlxDUtJhunMGuWelO4mTVf5wYYLB4Z75mmlarqbMJS9tbbVTm77KBtvmaH4nq5Z451fTYav4BUTzbiSspjdGOTsDvuiGvYtqOv1YGirrN8EzhWT6ilRsNNJlOiUyaFKhk+jqpUntei+CuTd2yzUQNPSVBOXlBXv0fihN4PKkViWPWoQw3X7Y7EvBtAZaVB9GU5Z2ddY3RHSsdTAyQ0VIvox2EjWaaOSIT43FAmtvMppITaCDuGrC0uwZeV81Y3U1vjd3sPKbbSouw2Aby2D/JXGSc7lGady8LbhMYxkOkdpMU9Z2SMpUeNglkL+zPw1sok0aerGL8IaFVuMS1ELqM5qQ2hfwUV/9dIkFlroy63hJgzJcwXTVlPZH0KVQZShwlnYslQ==,iv:V4qY602uIEncTDxZV6haItGVCvTwWLtW/2gvvUwbUKo=,tag:B0EcO7s9FfGoZ+ZjKshXiw==,type:str]
     apiServer:
-        image: registry.k8s.io/kube-apiserver:v1.30.1
+        image: registry.k8s.io/kube-apiserver:${KUBERNETES_VERSION}
         certSANs:
             - 127.0.0.1
             - 192.168.42.120
@@ -143,14 +143,14 @@ cluster:
             rules:
                 - level: Metadata
     controllerManager:
-        image: registry.k8s.io/kube-controller-manager:v1.30.1
+        image: registry.k8s.io/kube-controller-manager:${KUBERNETES_VERSION}
         extraArgs:
             bind-address: 0.0.0.0
     proxy:
         disabled: true
-        image: registry.k8s.io/kube-proxy:v1.30.1
+        image: registry.k8s.io/kube-proxy:${KUBERNETES_VERSION}
     scheduler:
-        image: registry.k8s.io/kube-scheduler:v1.30.1
+        image: registry.k8s.io/kube-scheduler:${KUBERNETES_VERSION}
         extraArgs:
             bind-address: 0.0.0.0
     discovery:

diff --git a/kubernetes/main/bootstrap/talos/assets/k8s-3.secret.sops.yaml b/kubernetes/main/bootstrap/talos/assets/k8s-3.secret.sops.yaml
@@ -11,7 +11,7 @@ machine:
         - 127.0.0.1
         - 192.168.42.120
     kubelet:
-        image: ghcr.io/siderolabs/kubelet:v1.30.1
+        image: ghcr.io/siderolabs/kubelet:${KUBERNETES_VERSION}
         extraArgs:
             rotate-server-certificates: "true"
         extraMounts:
@@ -41,7 +41,7 @@ machine:
         extraKernelArgs:
             - mitigations=off
             - module_blacklist=e1000e
-        image: factory.talos.dev/installer/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100:v1.7.4
+        image: factory.talos.dev/installer/${TALOS_SCHEMATIC_ID}:${TALOS_VERSION}
         wipe: false
     files:
         - content: |-

diff --git a/kubernetes/main/bootstrap/talos/assets/k8s-4.secret.sops.yaml b/kubernetes/main/bootstrap/talos/assets/k8s-4.secret.sops.yaml
@@ -11,7 +11,7 @@ machine:
         - 127.0.0.1
         - 192.168.42.120
     kubelet:
-        image: ghcr.io/siderolabs/kubelet:v1.30.1
+        image: ghcr.io/siderolabs/kubelet:${KUBERNETES_VERSION}
         extraArgs:
             rotate-server-certificates: "true"
         extraMounts:
@@ -41,7 +41,7 @@ machine:
         extraKernelArgs:
             - mitigations=off
             - module_blacklist=e1000e
-        image: factory.talos.dev/installer/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100:v1.7.4
+        image: factory.talos.dev/installer/${TALOS_SCHEMATIC_ID}:${TALOS_VERSION}
         wipe: false
     files:
         - content: |-

diff --git a/kubernetes/main/bootstrap/talos/assets/k8s-5.secret.sops.yaml b/kubernetes/main/bootstrap/talos/assets/k8s-5.secret.sops.yaml
@@ -11,7 +11,7 @@ machine:
         - 127.0.0.1
         - 192.168.42.120
     kubelet:
-        image: ghcr.io/siderolabs/kubelet:v1.30.1
+        image: ghcr.io/siderolabs/kubelet:${KUBERNETES_VERSION}
         extraArgs:
             rotate-server-certificates: "true"
         extraMounts:
@@ -41,7 +41,7 @@ machine:
         extraKernelArgs:
             - mitigations=off
             - module_blacklist=e1000e
-        image: factory.talos.dev/installer/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100:v1.7.4
+        image: factory.talos.dev/installer/${TALOS_SCHEMATIC_ID}:${TALOS_VERSION}
         wipe: false
     files:
         - content: |-

diff --git a/kubernetes/main/bootstrap/talos/profiles/k8s-0.json b/kubernetes/main/bootstrap/talos/profiles/k8s-0.json
@@ -2,8 +2,10 @@
   "id": "k8s-0",
   "name": "k8s-0",
   "boot": {
-    "kernel": "/assets/k8s-0.kernel-amd64",
-    "initrd": ["/assets/k8s-0.initramfs-amd64.xz"],
+    "kernel": "/assets/kernel-amd64",
+    "initrd": [
+      "/assets/initramfs-amd64.xz"
+    ],
     "args": [
       "initrd=initramfs-amd64.xz",
       "init_on_alloc=1",

diff --git a/kubernetes/main/bootstrap/talos/profiles/k8s-1.json b/kubernetes/main/bootstrap/talos/profiles/k8s-1.json
@@ -2,8 +2,10 @@
   "id": "k8s-1",
   "name": "k8s-1",
   "boot": {
-    "kernel": "/assets/k8s-1.kernel-amd64",
-    "initrd": ["/assets/k8s-1.initramfs-amd64.xz"],
+    "kernel": "/assets/kernel-amd64",
+    "initrd": [
+      "/assets/initramfs-amd64.xz"
+    ],
     "args": [
       "initrd=initramfs-amd64.xz",
       "init_on_alloc=1",

diff --git a/kubernetes/main/bootstrap/talos/profiles/k8s-2.json b/kubernetes/main/bootstrap/talos/profiles/k8s-2.json
@@ -2,8 +2,10 @@
   "id": "k8s-2",
   "name": "k8s-2",
   "boot": {
-    "kernel": "/assets/k8s-2.kernel-amd64",
-    "initrd": ["/assets/k8s-2.initramfs-amd64.xz"],
+    "kernel": "/assets/kernel-amd64",
+    "initrd": [
+      "/assets/initramfs-amd64.xz"
+    ],
     "args": [
       "initrd=initramfs-amd64.xz",
       "init_on_alloc=1",