Unverified Commit 7f6cd383 authored by Mogeko's avatar Mogeko
Browse files

nixos/rke2: modify the systemd unit name to be consistent with the upstream 

remove `fix-systemd-unit-name.patch`.
parent aaac31c8

nixos/modules/services/cluster/rke2/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ in 
      "kernel.panic_on_oops" = 1;

    };



    systemd.services.rke2 = {

    systemd.services."rke2-${cfg.role}" = {

      description = "Rancher Kubernetes Engine v2";

      documentation = [ "https://github.com/rancher/rke2#readme" ];

      after = [ "network-online.target" ];

pkgs/applications/networking/cluster/rke2/builder.nix

+0 −3
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ buildGoModule rec { 
    lvm2 # dmsetup

  ];



  # Patch the systemd unit name to be `rke2.service`.

  patches = [ ./fix-systemd-unit-name.patch ];



  # See: https://github.com/rancher/rke2/blob/e7f87c6dd56fdd76a7dab58900aeea8946b2c008/scripts/build-binary#L27-L38

  ldflags = [

    "-w"

pkgs/applications/networking/cluster/rke2/fix-systemd-unit-name.patch

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
diff --git a/bundle/bin/rke2-killall.sh b/bundle/bin/rke2-killall.sh

index 1099ad90..db8a7ea9 100755

--- a/bundle/bin/rke2-killall.sh

+++ b/bundle/bin/rke2-killall.sh

@@ -54,8 +54,7 @@ export PATH=$PATH:/var/lib/rancher/rke2/bin

 

 set -x

 

-systemctl stop rke2-server.service || true

-systemctl stop rke2-agent.service || true

+systemctl stop rke2.service || true

 

 killtree $({ set +x; } 2>/dev/null; getshims; set -x)