Updated examples

nktpro · nktpro · commit 86316b8e3870 · 2023-10-23T01:51:13.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 /.vscode
 /.zsh_history
-.ssh
 .secrets
+.ssh
 /result
 /.env
diff --git a/examples/multi/.secrets/join.json b/examples/multi/.secrets/join.json
diff --git a/examples/multi/multi-1.ts b/examples/multi/multi-1.ts
@@ -2,16 +2,17 @@ import { ServerInstanceConfig } from "../../src/types.ts";
 
 export default {
   role: "server",
-  name: "jetski-multi-node-one",
+  name: "jetski-multi-node-1",
+  contextName: "jetski-multi",
   image: "22.04",
-  cpus: 1,
-  memoryGiBs: 2,
-  diskGiBs: 5,
+  cpus: 15,
+  memoryGiBs: 56,
+  diskGiBs: 200,
   k3sVersion: "v1.24.17+k3s1",
-  serviceCidr: "10.254.251.0/24",
-  clusterCidr: "10.254.252.0/22",
-  clusterDnsIp: "10.254.255.10",
-  clusterDomain: "jetski.local",
+  serviceCidr: "10.254.244.0/22",
+  clusterCidr: "10.254.248.0/21",
+  clusterDnsIp: "10.254.244.10",
+  clusterDomain: "cluster.local",
   bridged: Boolean(Deno.env.get("JETSKI_INSTANCE_BRIDGED")),
   externalNetworkCidr: Deno.env.get("JETSKI_INSTANCE_NODE_IP_CIDR"),
   externalNetworkInterface: "eth1",
diff --git a/examples/multi/multi-2.ts b/examples/multi/multi-2.ts
@@ -1,5 +1,5 @@
 import { AgentInstanceConfig } from "../../src/types.ts";
-import serverInstanceConfig from "./multi-one.ts";
+import serverInstanceConfig from "./multi-1.ts";
 
 const {
   k3sVersion,
@@ -20,11 +20,11 @@ export default {
   externalNetworkCidr,
   externalNetworkInterface,
   bridged,
-  name: "jetski-multi-node-two",
+  name: "jetski-multi-node-2",
   image: "22.04",
-  cpus: 1,
-  memoryGiBs: 2,
-  diskGiBs: 5,
+  cpus: 15,
+  memoryGiBs: 55,
+  diskGiBs: 200,
   nodeLabels: {
     "com.jetski/foo": "bar",
     "com.jetski/baz": "boo",
diff --git a/examples/multi/multi-3.ts b/examples/multi/multi-3.ts
@@ -1,9 +1,9 @@
 import { AgentInstanceConfig } from "../../src/types.ts";
-import agentInstanceConfig from "./multi-two.ts";
+import agentInstanceConfig from "./multi-2.ts";
 
 export default {
   ...agentInstanceConfig,
-  name: "jetski-multi-node-three",
+  name: "jetski-multi-node-3",
   nodeLabels: {
     "com.jetski/foo": "something",
     "com.jetski/baz": "else",
diff --git a/examples/multi/multi-4.ts b/examples/multi/multi-4.ts
@@ -0,0 +1,11 @@
+import { AgentInstanceConfig } from "../../src/types.ts";
+import agentInstanceConfig from "./multi-2.ts";
+
+export default {
+  ...agentInstanceConfig,
+  name: "jetski-multi-node-4",
+  nodeLabels: {
+    "com.jetski/foo": "something",
+    "com.jetski/baz": "else",
+  },
+} satisfies AgentInstanceConfig;
diff --git a/examples/multi/multi-5.ts b/examples/multi/multi-5.ts
@@ -0,0 +1,11 @@
+import { AgentInstanceConfig } from "../../src/types.ts";
+import agentInstanceConfig from "./multi-2.ts";
+
+export default {
+  ...agentInstanceConfig,
+  name: "jetski-multi-node-5",
+  nodeLabels: {
+    "com.jetski/foo": "something",
+    "com.jetski/baz": "else",
+  },
+} satisfies AgentInstanceConfig;
diff --git a/examples/multi/multi-6.ts b/examples/multi/multi-6.ts
@@ -0,0 +1,11 @@
+import { AgentInstanceConfig } from "../../src/types.ts";
+import agentInstanceConfig from "./multi-2.ts";
+
+export default {
+  ...agentInstanceConfig,
+  name: "jetski-multi-node-6",
+  nodeLabels: {
+    "com.jetski/foo": "something",
+    "com.jetski/baz": "else",
+  },
+} satisfies AgentInstanceConfig;
diff --git a/examples/multi/run_agents.sh b/examples/multi/run_agents.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
+
+# Loop from 2 to 6
+for i in $(seq 2 6); do
+  MULTIPASS_SERVER_ADDRESS="um790-${i}:51000" "${SCRIPT_DIR}"/../../cli.sh run --config ./examples/multi/multi-"${i}".ts "$@"
+done
diff --git a/examples/multi/run_server.sh b/examples/multi/run_server.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -euo pipefail
+SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
+MULTIPASS_SERVER_ADDRESS="um790-1:51000" "${SCRIPT_DIR}"/../../cli.sh run --config ./examples/multi/multi-1.ts "$@"
diff --git a/examples/single/single.ts b/examples/single/single.ts
@@ -4,14 +4,14 @@ export default {
   role: "server",
   name: "jetski-single-node",
   image: "22.04",
-  cpus: 1,
-  memoryGiBs: 2,
-  diskGiBs: 5,
+  cpus: 15,
+  memoryGiBs: 56,
+  diskGiBs: 200,
   k3sVersion: "v1.24.17+k3s1",
   clusterCidr: "10.254.254.0/24",
   serviceCidr: "10.254.255.0/24",
   clusterDnsIp: "10.254.255.10",
-  clusterDomain: "jetski.local",
+  clusterDomain: "cluster.local",
   bridged: Boolean(Deno.env.get("JETSKI_INSTANCE_BRIDGED")),
   externalNetworkCidr: Deno.env.get("JETSKI_INSTANCE_NODE_IP_CIDR"),
   disableComponents: {
diff --git a/scripts/00_setup_sshd.ps1 b/scripts/00_setup_sshd.ps1
@@ -1,6 +1,7 @@
+Add-WindowsCapability -Online -Name OpenSSH.Server
 Get-Service sshd | Set-Service -StartupType Automatic
 
-$authorizedKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmxihXDTbdPX7rVLKzZt6r/Qt9eZnrXCAWxCrmTOpZ6 nktpro@gmail.com"
+$authorizedKey = "[YOUR_PUBLIC_KEY]"
 Set-Content `
   -Force -Path $env:ProgramData\ssh\administrators_authorized_keys `
   -Value "$authorizedKey"
diff --git a/scripts/01_clean_windows.ps1 b/scripts/01_clean_windows.ps1
@@ -0,0 +1,45 @@
+# Disable taskbar widgets
+reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f
+Stop-Service 'WSearch'; Set-Service -Name 'WSearch' -StartupType 'Disabled'
+
+Get-NetAdapter -Name "*Wi-FI*" | Disable-NetAdapter -Confirm:$false
+Get-PnpDevice | Where-Object {$_.Class -eq 'Bluetooth' -and $_.Name -like '*Wireless Bluetooth*'} | ForEach-Object { Disable-PnpDevice -InstanceId $_.DeviceID -Confirm:$false }
+
+Get-AppxPackage *WindowsAlarms* | Remove-AppxPackage
+Get-AppxPackage *AV1VideoExtension* | Remove-AppxPackage
+Get-AppxPackage *WindowsCalculator* | Remove-AppxPackage
+Get-AppxPackage *Microsoft.549981C3F5F10* | Remove-AppxPackage
+Get-AppxPackage *WindowsFeedbackHub* | Remove-AppxPackage
+Get-AppxPackage *HEIFImageExtension* | Remove-AppxPackage
+Get-AppxPackage *GetHelp* | Remove-AppxPackage
+Get-AppxPackage *WindowsMaps* | Remove-AppxPackage
+Get-AppxPackage *Todos* | Remove-AppxPackage
+Get-AppxPackage *ZuneVideo* | Remove-AppxPackage
+Get-AppxPackage *MicrosoftOfficeHub* | Remove-AppxPackage
+Get-AppxPackage *Paint* | Remove-AppxPackage
+Get-AppxPackage *ZuneMusic* | Remove-AppxPackage
+Get-AppxPackage *BingNews* | Remove-AppxPackage
+Get-AppxPackage *OneDrive* | Remove-AppxPackage
+Get-AppxPackage *Windows.Photos* | Remove-AppxPackage
+Get-AppxPackage *ScreenSketch* | Remove-AppxPackage
+Get-AppxPackage *SkypeApp* | Remove-AppxPackage
+Get-AppxPackage *MicrosoftSolitaireCollection* | Remove-AppxPackage
+Get-AppxPackage *SpotifyAB.SpotifyMusic* | Remove-AppxPackage
+Get-AppxPackage *MicrosoftStickyNotes* | Remove-AppxPackage
+Get-AppxPackage *Teams* | Remove-AppxPackage
+Get-AppxPackage *WindowsSoundRecorder* | Remove-AppxPackage
+Get-AppxPackage *BingWeather* | Remove-AppxPackage
+Get-AppxPackage *WebpImageExtension* | Remove-AppxPackage
+Get-AppxPackage *YourPhone* | Remove-AppxPackage
+Get-AppxPackage *Microsoft.GamingApp* | Remove-AppxPackage
+Get-AppxPackage *Microsoft.OneConnect* | Remove-AppxPackage
+Get-AppxPackage *Microsoft.Whiteboard* | Remove-AppxPackage
+Get-AppxPackage *Microsoft.MinecraftEducationEdition* | Remove-AppxPackage
+Get-AppxPackage *Microsoft.MixedReality.Portal* | Remove-AppxPackage
+Get-AppxPackage *Clipchamp* | Remove-AppxPackage
+Get-AppxPackage *windowscommunicationsapps* | Remove-AppxPackage
+
+winget uninstall Microsoft.OneDrive --accept-source-agreements
+
+netsh advfirewall firewall add rule name="ICMP Allow incoming V4 echo request" protocol=icmpv4:8,any dir=in action=allow
+Get-NetAdapterBinding -ComponentID ms_tcpip6 | Disable-NetAdapterBinding -ComponentID ms_tcpip6
diff --git a/scripts/02_enable_hyper_v.ps1 b/scripts/02_enable_hyper_v.ps1
@@ -0,0 +1 @@
+Enable-WindowsOptionalFeature -NoRestart -Online -FeatureName Microsoft-Hyper-V -All
diff --git a/scripts/03_setup_multipass_switch.ps1 b/scripts/03_setup_multipass_switch.ps1
@@ -0,0 +1,11 @@
+try {
+  New-VMSwitch -name MultipassSwitch -NetAdapterName Ethernet -AllowManagementOS $true
+}
+catch {
+  if ($_.Exception.Message -notmatch "already bound") {
+    Write-Output $_
+    exit 1
+  }
+}
+
+Set-NetConnectionProfile -InterfaceAlias "vEthernet (MultipassSwitch)" -NetworkCategory Private
diff --git a/scripts/04_setup_multipassd.ps1 b/scripts/04_setup_multipassd.ps1
@@ -1,14 +1,19 @@
 Set-StrictMode -Version 2
 $ErrorActionPreference = 'Stop'
 
-try {
-  New-VMSwitch -name MultipassSwitch -NetAdapterName Ethernet -AllowManagementOS $true
-}
-catch {
-  if ($_.Exception.Message -notmatch "already bound") {
-    Write-Output $_
-    exit 1
+if (-not (Get-Command multipass.exe -ErrorAction SilentlyContinue)) {
+  $url = "https://multipass.run/download/windows"
+  $dirPath = "C:\Temp"
+  if (-Not (Test-Path $dirPath)) {
+    New-Item -ItemType Directory -Path $dirPath
   }
+  $filePath = "$dirPath\Multipass-Installer.exe"
+  Write-Output "Downloading Multipass from $url to $filePath"
+  Invoke-WebRequest -Uri $url -OutFile $filePath
+  # Install Multipass silently
+  Write-Output "Installing Multipass from $filePath"
+  Start-Process -FilePath $filePath -Args "/S" -Wait
+  Write-Output "Installed Multipass"
 }
 
 $hostname = $env:COMPUTERNAME.ToLower()
@@ -76,42 +81,42 @@ function Wait-ForMultipassd {
 
 Wait-ForMultipassd
 
-# Write-Output "Setting local.passphrase"
-# multipass.exe set local.passphrase=foo
-# if ($LASTEXITCODE -ne 0) {
-#   Write-Output "Failed to set local.passphrase"
-#   exit $LASTEXITCODE
-# }
-
-# Wait-ForMultipassd
-# Write-Output "Setting local.bridged-network"
-# multipass.exe set local.bridged-network=MultipassSwitch
-# if ($LASTEXITCODE -ne 0) {
-#   Write-Output "Failed to set local.bridged-network"
-#   exit $LASTEXITCODE
-# }
-
-# # # Wait-ForMultipassd
-# Write-Output "Getting ethernet IP"
-# try {
-#   $ethIp = (Get-NetIPAddress -InterfaceAlias "vEthernet (MultipassSwitch)" -AddressFamily IPv4).IPAddress
-# }
-# catch {
-#   Write-Output "Failed to get ethernet IP"
-#   Write-Output $_
-#   exit 1
-# }
-
-# Write-Output "Found ethernet IP: $ethIp"
-
-# Write-Output "Going to add portproxy rule for $($ethIp):$($multipassdPort)"
-# netsh interface portproxy add v4tov4 listenport=$multipassdPort listenaddress=$ethIp connectport=$multipassdPort connectaddress=127.0.0.1
-# if ($LASTEXITCODE -ne 0) {
-#   exit $LASTEXITCODE
-# }
-
-# Write-Output "Going to add firewall rule for $($ethIp):$($multipassdPort)"
-# New-NetFirewallRule -DisplayName "multipassd_51000" -Direction Inbound -Protocol TCP -LocalPort $multipassdPort -Action Allow -PolicyStore PersistentStore
-# if ($LASTEXITCODE -ne 0) {
-#   exit $LASTEXITCODE
-# }
+Write-Output "Setting local.passphrase"
+multipass.exe set local.passphrase=foo
+if ($LASTEXITCODE -ne 0) {
+  Write-Output "Failed to set local.passphrase"
+  exit $LASTEXITCODE
+}
+
+Wait-ForMultipassd
+Write-Output "Setting local.bridged-network"
+multipass.exe set local.bridged-network=MultipassSwitch
+if ($LASTEXITCODE -ne 0) {
+  Write-Output "Failed to set local.bridged-network"
+  exit $LASTEXITCODE
+}
+
+# # Wait-ForMultipassd
+Write-Output "Getting ethernet IP"
+try {
+  $ethIp = (Get-NetIPAddress -InterfaceAlias "vEthernet (MultipassSwitch)" -AddressFamily IPv4).IPAddress
+}
+catch {
+  Write-Output "Failed to get ethernet IP"
+  Write-Output $_
+  exit 1
+}
+
+Write-Output "Found ethernet IP: $ethIp"
+
+Write-Output "Going to add portproxy rule for $($ethIp):$($multipassdPort)"
+netsh interface portproxy add v4tov4 listenport=$multipassdPort listenaddress=$ethIp connectport=$multipassdPort connectaddress=127.0.0.1
+if ($LASTEXITCODE -ne 0) {
+  exit $LASTEXITCODE
+}
+
+Write-Output "Going to add firewall rule for $($ethIp):$($multipassdPort)"
+New-NetFirewallRule -DisplayName "multipassd_51000" -Direction Inbound -Protocol TCP -LocalPort $multipassdPort -Action Allow -PolicyStore PersistentStore
+if ($LASTEXITCODE -ne 0) {
+  exit $LASTEXITCODE
+}
diff --git a/scripts/ssh_pwsh.sh b/scripts/ssh_pwsh.sh
@@ -5,4 +5,4 @@ SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 NODE_ADDRESS=${1:?"The remote node address is required"}
 PS_SCRIPT=${2:?"The the powershell script name is required"}
 
-ssh -o LogLevel=error "${NODE_ADDRESS}" powershell.exe -NoLogo -NonInteractive -Command - < "${SCRIPT_DIR}/${PS_SCRIPT}.ps1"
+ssh -o LogLevel=error "${NODE_ADDRESS}" powershell.exe -NoLogo -Command - < "${SCRIPT_DIR}/${PS_SCRIPT}.ps1"
diff --git a/src/actions/create.ts b/src/actions/create.ts
@@ -19,7 +19,7 @@ import {
   multipassTailCloudInitOutputLog,
   multipassWaitForState,
 } from "../multipass.ts";
-import { InstanceConfig, InstanceConfigPathSchema, InstanceState } from "../types.ts";
+import { InstanceConfig, InstanceConfigPathSchema, InstanceState, ServerInstanceConfig } from "../types.ts";
 import {
   createCloudInitConfig,
   err,
@@ -31,9 +31,10 @@ import {
 } from "../utils.ts";
 
 export async function updateKubeconfig(
-  { ip, instance }: { ip: string; instance: InstanceConfig },
+  { ip, instance }: { ip: string; instance: ServerInstanceConfig },
 ) {
-  const { name, sshDirectoryPath } = instance;
+  const { name: instanceName, contextName = instanceName, sshDirectoryPath } = instance;
+
   log(
     "Fetching instance's kubeconfig from /etc/rancher/k3s/k3s.yaml over SSH",
   );
@@ -47,12 +48,12 @@ export async function updateKubeconfig(
   ) as any;
 
   kubeconfig.clusters[0].cluster.server = `https://${ip}:6443`;
-  kubeconfig.clusters[0].name = name;
-  kubeconfig.contexts[0].context.cluster = name;
-  kubeconfig.contexts[0].context.user = name;
-  kubeconfig.contexts[0].name = name;
-  kubeconfig["current-context"] = name;
-  kubeconfig.users[0].name = name;
+  kubeconfig.clusters[0].name = contextName;
+  kubeconfig.contexts[0].context.cluster = contextName;
+  kubeconfig.contexts[0].context.user = contextName;
+  kubeconfig.contexts[0].name = contextName;
+  kubeconfig["current-context"] = contextName;
+  kubeconfig.users[0].name = contextName;
 
   const tempDir = await Deno.makeTempDir();
   const tempKubeConfigFile = joinPath(tempDir, "kubeconfig.yaml");
@@ -77,7 +78,7 @@ export async function updateKubeconfig(
 
   await Deno.writeTextFile(kubeConfigFile, newKubeConfig);
 
-  ok("Kubeconfig has been updated. The current context should now be", cyan(name));
+  ok("Kubeconfig has been updated. The current context should now be", cyan(contextName));
 }
 
 export async function createInstance(instance: InstanceConfig, signal: AbortSignal) {
diff --git a/src/actions/refresh.ts b/src/actions/refresh.ts
diff --git a/src/types.ts b/src/types.ts
diff --git a/src/utils.ts b/src/utils.ts
