From 5f8969ee0ee0b985c5e27d970cdc458a25a807fa Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Tue, 22 Oct 2024 18:54:06 +0200
Subject: [PATCH] @viceice review comments

---
 k3s-host/setup.sh              | 2 +-
 k8s-forgejo/forgejo-values.yml | 1 -
 k8s-forgejo/next-values.yml    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/k3s-host/setup.sh b/k3s-host/setup.sh
index 8226d9f..2064583 100755
--- a/k3s-host/setup.sh
+++ b/k3s-host/setup.sh
@@ -182,7 +182,7 @@ EOF
 			args="$args --disable-apiserver --disable-controller-manager --disable-scheduler"
 		fi
 		export INSTALL_K3S_VERSION=$K3S_VERSION
-		curl -fL https://get.k3s.io | sh -s - server $args --cluster-init --disable=servicelb --disable=traefik --write-kubeconfig-mode=644 --node-ip=$node_k8s_ipv4_prefix.$self_node,$node_k8s_ipv6_prefix::$self_node $node_k8s_cidr --flannel-ipv6-masq
+		curl -fL https://get.k3s.io | sh -s - server $args --cluster-init --disable=servicelb --disable=traefik --write-kubeconfig-mode=600 --node-ip=$node_k8s_ipv4_prefix.$self_node,$node_k8s_ipv6_prefix::$self_node $node_k8s_cidr --flannel-ipv6-masq
 		if test "$self_node" = $node_k8s_etcd; then
 			retry --times 20 -- kubectl taint nodes $(hostname) key1=value1:NoSchedule
 		fi
diff --git a/k8s-forgejo/forgejo-values.yml b/k8s-forgejo/forgejo-values.yml
index d509abc..b5b644c 100644
--- a/k8s-forgejo/forgejo-values.yml
+++ b/k8s-forgejo/forgejo-values.yml
@@ -17,7 +17,6 @@ service:
     type: ClusterIP
     ipFamilyPolicy: PreferDualStack
     clusterIP: ~
-    port: 3000
   ssh:
     type: ClusterIP
     clusterIP: ~
diff --git a/k8s-forgejo/next-values.yml b/k8s-forgejo/next-values.yml
index 08fdd81..7cd9595 100644
--- a/k8s-forgejo/next-values.yml
+++ b/k8s-forgejo/next-values.yml
@@ -21,7 +21,7 @@ ingress:
 
 service:
   ssh:
-    port: 2222
+    port: ssh
 
 extraDeploy:
   # Route from traefik to forgejo