From b29eec5b1ba80fbeef10f18b55001f2ec33598e1 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Mon, 9 Mar 2026 13:30:57 -0400 Subject: [PATCH] Go back to installing rke2 in the image --- recipes/common/wke.yml | 4 ---- recipes/wke-fw-desktop.yml | 12 ++++++++---- recipes/wke-server.yml | 11 ++++++++--- recipes/wke-worker.yml | 11 ++++++++--- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/recipes/common/wke.yml b/recipes/common/wke.yml index 886edf7..f3ecd60 100644 --- a/recipes/common/wke.yml +++ b/recipes/common/wke.yml @@ -25,10 +25,6 @@ modules: - cryptsetup - device-mapper - fuse - # - type: script - # snippets: - # - curl -sfL https://get.rke2.io | sh - # - cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf - type: files files: - source: rke-common diff --git a/recipes/wke-fw-desktop.yml b/recipes/wke-fw-desktop.yml index 99f75b6..c06178a 100644 --- a/recipes/wke-fw-desktop.yml +++ b/recipes/wke-fw-desktop.yml @@ -21,8 +21,12 @@ modules: # install: # packages: # - ramalama - # - type: script - # snippets: - # # - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh - # - curl -sfL https://get.rke2.io | INSTALL_RKE2_SKIP_RELOAD=true sh + - type: script + env: + INSTALL_RKE2_CHANNEL: latest + INSTALL_RKE2_TYPE: server + INSTALL_RKE2_SKIP_RELOAD: 'true' + snippets: + - curl -sfL https://get.rke2.io | sh + - cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf - from-file: common/post-build.yml diff --git a/recipes/wke-server.yml b/recipes/wke-server.yml index c31cf00..5cf64ae 100644 --- a/recipes/wke-server.yml +++ b/recipes/wke-server.yml @@ -12,7 +12,12 @@ modules: files: - source: rke-server destination: / - # - type: script - # snippets: - # - curl -sfL https://get.rke2.io | INSTALL_RKE2_SKIP_RELOAD=true sh + - type: script + env: + INSTALL_RKE2_CHANNEL: latest + INSTALL_RKE2_TYPE: server + INSTALL_RKE2_SKIP_RELOAD: 'true' + snippets: + - curl -sfL https://get.rke2.io | sh + - cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf - from-file: common/post-build.yml diff --git a/recipes/wke-worker.yml b/recipes/wke-worker.yml index 70945cf..1f62ce0 100644 --- a/recipes/wke-worker.yml +++ b/recipes/wke-worker.yml @@ -8,7 +8,12 @@ alt-tags: - worker modules: - from-file: common/wke.yml - # - type: script - # snippets: - # - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh + - type: script + env: + INSTALL_RKE2_CHANNEL: latest + INSTALL_RKE2_TYPE: agent + INSTALL_RKE2_SKIP_RELOAD: 'true' + snippets: + - curl -sfL https://get.rke2.io | sh + - cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf - from-file: common/post-build.yml