From 55461f014973c7c91a3be5f2373900e46ceb7ab9 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 12 Mar 2024 23:25:46 -0400
Subject: [PATCH] feat: switch the default k3s routing layer from traefik to
 nginx

The ingress-nginx ingress implementation is the standard ingress in the Kubernetes community, and it doesn't make sense for us to stray from that just to utilize the k3s default.

In the future, we might drop k3s, but this works well for now.
---
 docs/appendices/0.34.0-migration-guide.md | 8 ++++++++
 docs/deployment/schedulers/k3s.md         | 6 +++---
 plugins/scheduler-k3s/scheduler_k3s.go    | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/appendices/0.34.0-migration-guide.md b/docs/appendices/0.34.0-migration-guide.md
index f080d4fe0..b2811ce51 100644
--- a/docs/appendices/0.34.0-migration-guide.md
+++ b/docs/appendices/0.34.0-migration-guide.md
@@ -3,3 +3,11 @@
 ## Removals
 
 - The `disable-chown` property of the `scheduler-docker-local` plugin has been removed. Mounted paths will no longer have file permissions changed during the pre-deploy phase. Files baked into the container image for herokuish builds will always be owned by the correct user.
+
+## Changes
+
+- The k3s scheduler now defaults to nginx as it's default proxy implementation. The traefik proxy implementation is still available, though users will need to set the global `ingress-class` k3s property to `traefik` via the following command:
+
+    ```shell
+    dokku scheduler-k3s:set --global ingress-class traefik
+    ```
diff --git a/docs/deployment/schedulers/k3s.md b/docs/deployment/schedulers/k3s.md
index e24a3b4db..c357332ea 100644
--- a/docs/deployment/schedulers/k3s.md
+++ b/docs/deployment/schedulers/k3s.md
@@ -58,12 +58,12 @@ By default, Dokku will attempt to auto-detect the IP address of the server. In c
 dokku scheduler-k3s:initialize --server-ip 192.168.20.15
 ```
 
-Dokku's k3s integration natively uses `Traefik` as it's ingress load balancer via [Traefik's CRDs](https://doc.traefik.io/traefik/providers/kubernetes-crd/), but a cluster can be set to use `nginx` via the [ingress-nginx](https://github.com/kubernetes/ingress-nginx) project. Switching to nginx will result in any `nginx` plugin settings being respected, either by turning them into annotations or creating a custom server snippet.
+Dokku's k3s integration natively uses `nginx` as it's ingress load balancer via [ingress-nginx](https://github.com/kubernetes/ingress-nginx). Properties set by the `nginx` plugin will be respected, either by turning them into annotations or creating a custom server/location snippet that the `ingress-nginx` project can use.
 
-To change the ingress, set the `--ingress-class` flag:
+Dokku can also use Traefik on cluster initialization via the [Traefik's CRDs](https://doc.traefik.io/traefik/providers/kubernetes-crd/). To change the ingress, set the `--ingress-class` flag:
 
 ```shell
-dokku scheduler-k3s:initialize --ingress-class nginx
+dokku scheduler-k3s:initialize --ingress-class traefik
 ```
 
 ### Adding nodes to the cluster
diff --git a/plugins/scheduler-k3s/scheduler_k3s.go b/plugins/scheduler-k3s/scheduler_k3s.go
index f03bc6ffc..d72005b22 100644
--- a/plugins/scheduler-k3s/scheduler_k3s.go
+++ b/plugins/scheduler-k3s/scheduler_k3s.go
@@ -42,7 +42,7 @@ var (
 	}
 )
 
-const DefaultIngressClass = "traefik"
+const DefaultIngressClass = "nginx"
 const GlobalProcessType = "--global"
 const KubeConfigPath = "/etc/rancher/k3s/k3s.yaml"
 const DefaultKubeContext = ""