Merge pull request #2971 from fosrl/dev

1.18.2

src/components/newt-install-commands.tsx

@@ -52,10 +52,6 @@ export function NewtSiteInstallCommands({
     const acceptClientsEnv = !acceptClients
         ? "\n      - DISABLE_CLIENTS=true"
         : "";
-    const acceptClientsHelmValue = acceptClients
-        ? ` \\
-      --set newtInstances[0].acceptClients=true`
-        : "";
 
     const commandList: Record<Platform, Record<string, CommandItem[]>> = {
         linux: {
@@ -166,18 +162,13 @@ sudo systemctl enable --now newt`
             "Helm Chart": [
                 `helm repo add fossorial https://charts.fossorial.io`,
                 `helm repo update fossorial`,
-                `kubectl create namespace newt --dry-run=client -o yaml | kubectl apply -f -`,
+                `helm install newt fossorial/newt \\
-                `kubectl create secret generic newt-main-tunnel-auth \\
+    --create-namespace \\
-   -n newt \\
+    --set newtInstances[0].name="main-tunnel" \\
-  --from-literal=PANGOLIN_ENDPOINT="${endpoint}" \\
+    --set newtInstances[0].enabled=true \\
-  --from-literal=NEWT_ID="${id}" \\
+    --set-string newtInstances[0].auth.keys.endpointKey="${endpoint}" \\
-  --from-literal=NEWT_SECRET="${secret}" \\
+    --set-string newtInstances[0].auth.keys.idKey="${id}" \\
-  --dry-run=client -o yaml | kubectl apply -f -`,
+    --set-string newtInstances[0].auth.keys.secretKey="${secret}"`
-                `helm upgrade --install newt fossorial/newt \\
-  -n newt \\
-  --set newtInstances[0].name="main-tunnel" \\
-  --set newtInstances[0].enabled=true \\
-  --set-string newtInstances[0].auth.existingSecretName="newt-main-tunnel-auth"${acceptClientsHelmValue}`
             ]
         },
         podman: {