Unverified Commit 69ff9034 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

nixos/rke2: merge code with nixos/k3s (#447847)

parents bb43ec5a cc777a7b

.github/labeler.yml

+2 −1
Original line number Diff line number Diff line
@@ -261,7 +261,8 @@ 
  - any:

      - changed-files:

          - any-glob-to-any-file:

              - nixos/modules/services/cluster/k3s/**/*

              - nixos/modules/services/cluster/rancher/default.nix

              - nixos/modules/services/cluster/rancher/k3s.nix

              - nixos/tests/k3s/**/*

              - pkgs/applications/networking/cluster/k3s/**/*

nixos/doc/manual/release-notes/rl-2511.section.md

+3 −0
Original line number Diff line number Diff line
@@ -476,6 +476,9 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325). 


- `services.matter-server` now hosts a debug dashboard on the configured port. Open the port on the firewall with `services.matter-server.openFirewall`.



- `services.k3s` now shares most of its code with `services.rke2`. The merge resulted in both modules providing more options, with `services.rke2` receiving the most improvements.

  Existing configurations for either module should not be affected.



- The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).

  With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.

nixos/modules/module-list.nix

+1 −2
Original line number Diff line number Diff line
@@ -474,7 +474,6 @@ 
  ./services/cluster/corosync/default.nix

  ./services/cluster/druid/default.nix

  ./services/cluster/hadoop/default.nix

  ./services/cluster/k3s/default.nix

  ./services/cluster/kubernetes/addon-manager.nix

  ./services/cluster/kubernetes/addons/dns.nix

  ./services/cluster/kubernetes/apiserver.nix
@@ -487,7 +486,7 @@ 
  ./services/cluster/kubernetes/scheduler.nix

  ./services/cluster/pacemaker/default.nix

  ./services/cluster/patroni/default.nix

  ./services/cluster/rke2/default.nix

  ./services/cluster/rancher/default.nix

  ./services/cluster/spark/default.nix

  ./services/cluster/temporal/default.nix

  ./services/computing/boinc/client.nix

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

deleted100644 → 0
+0 −913

File deleted.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+966 −0

File added.

Preview size limit exceeded, changes collapsed.