@highstate/k3s 0.18.0 → 0.20.0

package/dist/cluster/index.js

@@ -1,11 +1,11 @@
 import { l3EndpointToString, l3EndpointToL4, l4EndpointToString, Command } from '@highstate/common';
 import { text } from '@highstate/contract';
 import { createK8sTerminal } from '@highstate/k8s';
-import { k3s } from '@highstate/library';
-import { forUnit, toPromise, output, interpolate, secret, fileFromString } from '@highstate/pulumi';
+import { k3s, k8s, common } from '@highstate/library';
+import { forUnit, toPromise, output, interpolate, secret, makeEntityOutput, makeFileOutput } from '@highstate/pulumi';
 import { KubeConfig } from '@kubernetes/client-node';
 import { Provider, core } from '@pulumi/kubernetes';
-import { uniqueBy, isIncludedIn } from 'remeda';
+import { uniqueBy, isIncludedIn, mergeDeep } from 'remeda';
 
 // src/cluster/index.ts
 var { name, args, inputs, outputs } = forUnit(k3s.cluster);
@@ -40,8 +40,6 @@ for (const disabledComponent of args.disabledComponents) {
 if (args.cni === "none") {
   serverConfig["flannel-backend"] = "none";
 }
-var serverConfigContent = JSON.stringify(serverConfig, null, 2);
-var agentConfigContent = JSON.stringify(agentConfig, null, 2);
 var seedInstallCommand = createNode(seed, "server", { K3S_CLUSTER_INIT: "true" });
 var tokenCommand = Command.receiveTextFile(
   "token",
@@ -62,20 +60,25 @@ var agentTokenCommand = Command.receiveTextFile(
 for (const master of masters.slice(1)) {
   createNode(master, "server", {
     K3S_TOKEN: tokenCommand.stdout,
+    INSTALL_K3S_EXEC: `--node-ip=${l3EndpointToString(master.endpoints[0])}`,
     K3S_URL: `https://${l4EndpointToString(apiEndpoints[0])}`
   });
 }
 for (const worker of workers) {
   createNode(worker, "agent", {
     K3S_TOKEN: agentTokenCommand.stdout,
+    INSTALL_K3S_EXEC: `--node-ip=${l3EndpointToString(worker.endpoints[0])}`,
     K3S_URL: `https://${l4EndpointToString(apiEndpoints[0])}`
   });
 }
-function createNode(server, type, env, dependsOn) {
+function createNode(server, type, env) {
+  const baseConfig = type === "server" ? serverConfig : agentConfig;
+  const nodeSpecificConfig = args.nodeConfig?.[server.hostname] ?? {};
+  const mergedConfig = mergeDeep(baseConfig, nodeSpecificConfig);
   const configFileCommand = Command.createTextFile(`config-${server.hostname}`, {
     host: server,
     path: "/etc/rancher/k3s/config.yaml",
-    content: type === "server" ? serverConfigContent : agentConfigContent
+    content: JSON.stringify(mergedConfig, null, 2)
   });
   const registryConfigFileCommand = Command.createTextFile(`registry-config-${server.hostname}`, {
     host: server,
@@ -93,7 +96,7 @@ function createNode(server, type, env, dependsOn) {
       delete: "/usr/local/bin/k3s-uninstall.sh || true"
     },
     {
-      dependsOn: [configFileCommand, registryConfigFileCommand, ...[]]
+      dependsOn: [configFileCommand, registryConfigFileCommand]
     }
   );
 }
@@ -114,8 +117,13 @@ var kubeConfig = new KubeConfig();
 kubeConfig.loadFromString(kubeconfig);
 var provider = new Provider(name, { kubeconfig: secret(kubeconfig) });
 var kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider });
-var cluster_default = outputs({
-  k8sCluster: {
+var k8sCluster = makeEntityOutput({
+  entity: k8s.clusterEntity,
+  identity: kubeSystem.metadata.uid,
+  meta: {
+    title: name
+  },
+  value: {
     id: kubeSystem.metadata.uid,
     connectionId: kubeSystem.metadata.uid,
     name,
@@ -125,8 +133,28 @@ var cluster_default = outputs({
     quirks: {
       externalServiceType: args.disabledComponents.includes("servicelb") ? "NodePort" : "LoadBalancer"
     },
-    kubeconfig: secret(kubeconfig)
-  },
+    kubeconfig: makeEntityOutput({
+      entity: common.fileEntity,
+      identity: interpolate`${kubeSystem.metadata.uid}:kubeconfig`,
+      meta: {
+        title: "kubeconfig"
+      },
+      value: {
+        meta: {
+          name: "kubeconfig",
+          mode: 384,
+          contentType: "text/yaml"
+        },
+        content: {
+          type: "embedded-secret",
+          value: kubeconfig
+        }
+      }
+    })
+  }
+});
+var cluster_default = outputs({
+  k8sCluster,
   $terminals: [createK8sTerminal(kubeconfig)],
   $statusFields: {
     endpoints: endpoints.map(l3EndpointToString),
@@ -148,7 +176,9 @@ var cluster_default = outputs({
         },
         {
           type: "file",
-          file: fileFromString("kubeconfig", kubeconfig, {
+          file: makeFileOutput({
+            name: "kubeconfig",
+            content: kubeconfig,
             contentType: "text/yaml",
             isSecret: true
           })

package/dist/cluster/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/cluster/index.ts"],"names":["env","kubeconfig"],"mappings":"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","file":"index.js","sourcesContent":["import { Command, l3EndpointToL4, l3EndpointToString, l4EndpointToString } from \"@highstate/common\"\nimport { text } from \"@highstate/contract\"\nimport { createK8sTerminal } from \"@highstate/k8s\"\nimport { type common, k3s } from \"@highstate/library\"\nimport {\n  fileFromString,\n  forUnit,\n  type InputRecord,\n  interpolate,\n  output,\n  type Resource,\n  secret,\n  toPromise,\n} from \"@highstate/pulumi\"\nimport { KubeConfig } from \"@kubernetes/client-node\"\nimport { core, Provider } from \"@pulumi/kubernetes\"\nimport { isIncludedIn, uniqueBy } from \"remeda\"\n\nconst { name, args, inputs, outputs } = forUnit(k3s.cluster)\n\nconst { masters, workers } = await toPromise(inputs)\n\nconst seed = masters[0]\n\nconst endpoints = uniqueBy(\n  [...workers, ...masters].flatMap(server => server.endpoints),\n  l3EndpointToString,\n)\n\nconst apiEndpoints = uniqueBy(\n  masters.flatMap(server => server.endpoints.map(endpoint => l3EndpointToL4(endpoint, 6443))),\n  l4EndpointToString,\n)\n\nconst sharedConfig: Record<string, unknown> = {\n  ...args.config,\n}\n\nconst serverConfig: Record<string, unknown> = {\n  ...sharedConfig,\n  ...args.serverConfig,\n  \"tls-san\": apiEndpoints.map(l3EndpointToString),\n  disable: args.disabledComponents.filter(isIncludedIn(k3s.packagedComponents)),\n}\n\nconst agentConfig: Record<string, unknown> = {\n  ...sharedConfig,\n  ...args.agentConfig,\n}\n\nfor (const disabledComponent of args.disabledComponents) {\n  if (isIncludedIn(disabledComponent, k3s.internalComponents)) {\n    serverConfig[`disable-${disabledComponent}`] = true\n  }\n}\n\nif (args.cni === \"none\") {\n  serverConfig[\"flannel-backend\"] = \"none\"\n}\n\nconst serverConfigContent = JSON.stringify(serverConfig, null, 2)\nconst agentConfigContent = JSON.stringify(agentConfig, null, 2)\n\nconst seedInstallCommand = createNode(seed, \"server\", { K3S_CLUSTER_INIT: \"true\" })\n\nconst tokenCommand = Command.receiveTextFile(\n  \"token\",\n  {\n    host: seed,\n    path: \"/var/lib/rancher/k3s/server/node-token\",\n  },\n  { dependsOn: seedInstallCommand },\n)\n\nconst agentTokenCommand = Command.receiveTextFile(\n  \"agent-token\",\n  {\n    host: seed,\n    path: \"/var/lib/rancher/k3s/server/agent-token\",\n  },\n  { dependsOn: seedInstallCommand },\n)\n\nfor (const master of masters.slice(1)) {\n  createNode(master, \"server\", {\n    K3S_TOKEN: tokenCommand.stdout,\n    K3S_URL: `https://${l4EndpointToString(apiEndpoints[0])}`,\n  })\n}\n\nfor (const worker of workers) {\n  createNode(worker, \"agent\", {\n    K3S_TOKEN: agentTokenCommand.stdout,\n    K3S_URL: `https://${l4EndpointToString(apiEndpoints[0])}`,\n  })\n}\n\nfunction createNode(\n  server: common.Server,\n  type: \"server\" | \"agent\",\n  env: InputRecord<string>,\n  dependsOn?: Resource,\n) {\n  const configFileCommand = Command.createTextFile(`config-${server.hostname}`, {\n    host: server,\n    path: \"/etc/rancher/k3s/config.yaml\",\n    content: type === \"server\" ? serverConfigContent : agentConfigContent,\n  })\n\n  const registryConfigFileCommand = Command.createTextFile(`registry-config-${server.hostname}`, {\n    host: server,\n    path: \"/etc/rancher/k3s/registries.yaml\",\n    content: JSON.stringify(args.registries ?? {}, null, 2),\n  })\n\n  const envString = output(env).apply(env => {\n    return Object.entries(env)\n      .map(([key, value]) => `${key}=${value}`)\n      .join(\" \")\n  })\n\n  return new Command(\n    `install-${server.hostname}`,\n    {\n      host: server,\n      create: interpolate`curl -fL https://raw.githubusercontent.com/k3s-io/k3s/refs/heads/main/install.sh | ${envString} sh -s - ${type}`,\n      delete: \"/usr/local/bin/k3s-uninstall.sh || true\",\n    },\n    {\n      dependsOn: [configFileCommand, registryConfigFileCommand, ...(dependsOn ? [dependsOn] : [])],\n    },\n  )\n}\n\nconst kubeconfigResult = Command.receiveTextFile(\n  \"kubeconfig\",\n  {\n    host: seed,\n    path: \"/etc/rancher/k3s/k3s.yaml\",\n  },\n  { dependsOn: seedInstallCommand },\n)\n\nconst kubeconfig = await toPromise(\n  kubeconfigResult.stdout.apply(kubeconfig =>\n    kubeconfig.replace(\"127.0.0.1:6443\", l4EndpointToString(apiEndpoints[0])),\n  ),\n)\n\nconst kubeConfig = new KubeConfig()\nkubeConfig.loadFromString(kubeconfig)\n\nconst provider = new Provider(name, { kubeconfig: secret(kubeconfig) })\nconst kubeSystem = core.v1.Namespace.get(\"kube-system\", \"kube-system\", { provider })\n\nexport default outputs({\n  k8sCluster: {\n    id: kubeSystem.metadata.uid,\n    connectionId: kubeSystem.metadata.uid,\n    name,\n\n    externalIps: endpoints\n      .filter(endpoint => endpoint.type !== \"hostname\")\n      .map(endpoint => endpoint.address),\n\n    endpoints,\n    apiEndpoints,\n\n    quirks: {\n      externalServiceType: args.disabledComponents.includes(\"servicelb\")\n        ? \"NodePort\"\n        : \"LoadBalancer\",\n    },\n\n    kubeconfig: secret(kubeconfig),\n  },\n\n  $terminals: [createK8sTerminal(kubeconfig)],\n\n  $statusFields: {\n    endpoints: endpoints.map(l3EndpointToString),\n    apiEndpoints: apiEndpoints.map(l4EndpointToString),\n  },\n\n  $pages: {\n    index: {\n      meta: {\n        title: \"K3s Cluster\",\n      },\n      content: [\n        {\n          type: \"markdown\",\n          content: text`\n            The cluster is up and running.\n\n            You can access the cluster via the terminal or by using the kubeconfig file.\n          `,\n        },\n        {\n          type: \"file\",\n          file: fileFromString(\"kubeconfig\", kubeconfig, {\n            contentType: \"text/yaml\",\n            isSecret: true,\n          }),\n        },\n        {\n          type: \"markdown\",\n          content: secret(text`\n            You can also copy the following content of the kubeconfig file and use it to access the cluster:\n\n            \\`\\`\\`yaml\n            ${kubeconfig}\n            \\`\\`\\`\n          `),\n        },\n      ],\n    },\n  },\n})\n"]}
+{"version":3,"sources":["../../src/cluster/index.ts"],"names":["env","kubeconfig"],"mappings":"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","file":"index.js","sourcesContent":["import { Command, l3EndpointToL4, l3EndpointToString, l4EndpointToString } from \"@highstate/common\"\nimport { text } from \"@highstate/contract\"\nimport { createK8sTerminal } from \"@highstate/k8s\"\nimport { common, k3s, k8s } from \"@highstate/library\"\nimport {\n  forUnit,\n  type InputRecord,\n  interpolate,\n  makeEntityOutput,\n  makeFileOutput,\n  output,\n  secret,\n  toPromise,\n} from \"@highstate/pulumi\"\nimport { KubeConfig } from \"@kubernetes/client-node\"\nimport { core, Provider } from \"@pulumi/kubernetes\"\nimport { isIncludedIn, mergeDeep, uniqueBy } from \"remeda\"\n\nconst { name, args, inputs, outputs } = forUnit(k3s.cluster)\n\nconst { masters, workers } = await toPromise(inputs)\n\nconst seed = masters[0]\n\nconst endpoints = uniqueBy(\n  [...workers, ...masters].flatMap(server => server.endpoints),\n  l3EndpointToString,\n)\n\nconst apiEndpoints = uniqueBy(\n  masters.flatMap(server => server.endpoints.map(endpoint => l3EndpointToL4(endpoint, 6443))),\n  l4EndpointToString,\n)\n\nconst sharedConfig: Record<string, unknown> = {\n  ...args.config,\n}\n\nconst serverConfig: Record<string, unknown> = {\n  ...sharedConfig,\n  ...args.serverConfig,\n  \"tls-san\": apiEndpoints.map(l3EndpointToString),\n  disable: args.disabledComponents.filter(isIncludedIn(k3s.packagedComponents)),\n}\n\nconst agentConfig: Record<string, unknown> = {\n  ...sharedConfig,\n  ...args.agentConfig,\n}\n\nfor (const disabledComponent of args.disabledComponents) {\n  if (isIncludedIn(disabledComponent, k3s.internalComponents)) {\n    serverConfig[`disable-${disabledComponent}`] = true\n  }\n}\n\nif (args.cni === \"none\") {\n  serverConfig[\"flannel-backend\"] = \"none\"\n}\n\nconst seedInstallCommand = createNode(seed, \"server\", { K3S_CLUSTER_INIT: \"true\" })\n\nconst tokenCommand = Command.receiveTextFile(\n  \"token\",\n  {\n    host: seed,\n    path: \"/var/lib/rancher/k3s/server/node-token\",\n  },\n  { dependsOn: seedInstallCommand },\n)\n\nconst agentTokenCommand = Command.receiveTextFile(\n  \"agent-token\",\n  {\n    host: seed,\n    path: \"/var/lib/rancher/k3s/server/agent-token\",\n  },\n  { dependsOn: seedInstallCommand },\n)\n\nfor (const master of masters.slice(1)) {\n  createNode(master, \"server\", {\n    K3S_TOKEN: tokenCommand.stdout,\n    INSTALL_K3S_EXEC: `--node-ip=${l3EndpointToString(master.endpoints[0])}`,\n    K3S_URL: `https://${l4EndpointToString(apiEndpoints[0])}`,\n  })\n}\n\nfor (const worker of workers) {\n  createNode(worker, \"agent\", {\n    K3S_TOKEN: agentTokenCommand.stdout,\n    INSTALL_K3S_EXEC: `--node-ip=${l3EndpointToString(worker.endpoints[0])}`,\n    K3S_URL: `https://${l4EndpointToString(apiEndpoints[0])}`,\n  })\n}\n\nfunction createNode(server: common.Server, type: \"server\" | \"agent\", env: InputRecord<string>) {\n  const baseConfig = type === \"server\" ? serverConfig : agentConfig\n  const nodeSpecificConfig = args.nodeConfig?.[server.hostname] ?? {}\n\n  const mergedConfig = mergeDeep(baseConfig, nodeSpecificConfig)\n\n  const configFileCommand = Command.createTextFile(`config-${server.hostname}`, {\n    host: server,\n    path: \"/etc/rancher/k3s/config.yaml\",\n    content: JSON.stringify(mergedConfig, null, 2),\n  })\n\n  const registryConfigFileCommand = Command.createTextFile(`registry-config-${server.hostname}`, {\n    host: server,\n    path: \"/etc/rancher/k3s/registries.yaml\",\n    content: JSON.stringify(args.registries ?? {}, null, 2),\n  })\n\n  const envString = output(env).apply(env => {\n    return Object.entries(env)\n      .map(([key, value]) => `${key}=${value}`)\n      .join(\" \")\n  })\n\n  return new Command(\n    `install-${server.hostname}`,\n    {\n      host: server,\n      create: interpolate`curl -fL https://raw.githubusercontent.com/k3s-io/k3s/refs/heads/main/install.sh | ${envString} sh -s - ${type}`,\n      delete: \"/usr/local/bin/k3s-uninstall.sh || true\",\n    },\n    {\n      dependsOn: [configFileCommand, registryConfigFileCommand],\n    },\n  )\n}\n\nconst kubeconfigResult = Command.receiveTextFile(\n  \"kubeconfig\",\n  {\n    host: seed,\n    path: \"/etc/rancher/k3s/k3s.yaml\",\n  },\n  { dependsOn: seedInstallCommand },\n)\n\nconst kubeconfig = await toPromise(\n  kubeconfigResult.stdout.apply(kubeconfig =>\n    kubeconfig.replace(\"127.0.0.1:6443\", l4EndpointToString(apiEndpoints[0])),\n  ),\n)\n\nconst kubeConfig = new KubeConfig()\nkubeConfig.loadFromString(kubeconfig)\n\nconst provider = new Provider(name, { kubeconfig: secret(kubeconfig) })\nconst kubeSystem = core.v1.Namespace.get(\"kube-system\", \"kube-system\", { provider })\n\nconst k8sCluster = makeEntityOutput({\n  entity: k8s.clusterEntity,\n  identity: kubeSystem.metadata.uid,\n  meta: {\n    title: name,\n  },\n  value: {\n    id: kubeSystem.metadata.uid,\n    connectionId: kubeSystem.metadata.uid,\n    name,\n\n    externalIps: endpoints\n      .filter(endpoint => endpoint.type !== \"hostname\")\n      .map(endpoint => endpoint.address),\n\n    endpoints,\n    apiEndpoints,\n\n    quirks: {\n      externalServiceType: args.disabledComponents.includes(\"servicelb\")\n        ? \"NodePort\"\n        : \"LoadBalancer\",\n    },\n\n    kubeconfig: makeEntityOutput({\n      entity: common.fileEntity,\n      identity: interpolate`${kubeSystem.metadata.uid}:kubeconfig`,\n      meta: {\n        title: \"kubeconfig\",\n      },\n      value: {\n        meta: {\n          name: \"kubeconfig\",\n          mode: 0o600,\n          contentType: \"text/yaml\",\n        },\n        content: {\n          type: \"embedded-secret\",\n          value: kubeconfig,\n        },\n      },\n    }),\n  },\n})\n\nexport default outputs({\n  k8sCluster,\n\n  $terminals: [createK8sTerminal(kubeconfig)],\n\n  $statusFields: {\n    endpoints: endpoints.map(l3EndpointToString),\n    apiEndpoints: apiEndpoints.map(l4EndpointToString),\n  },\n\n  $pages: {\n    index: {\n      meta: {\n        title: \"K3s Cluster\",\n      },\n      content: [\n        {\n          type: \"markdown\",\n          content: text`\n            The cluster is up and running.\n\n            You can access the cluster via the terminal or by using the kubeconfig file.\n          `,\n        },\n        {\n          type: \"file\",\n          file: makeFileOutput({\n            name: \"kubeconfig\",\n            content: kubeconfig,\n            contentType: \"text/yaml\",\n            isSecret: true,\n          }),\n        },\n        {\n          type: \"markdown\",\n          content: secret(text`\n            You can also copy the following content of the kubeconfig file and use it to access the cluster:\n\n            \\`\\`\\`yaml\n            ${kubeconfig}\n            \\`\\`\\`\n          `),\n        },\n      ],\n    },\n  },\n})\n"]}

package/dist/highstate.manifest.json

@@ -1,5 +1,5 @@
 {
   "sourceHashes": {
-    "./dist/cluster/index.js": 2359988465
+    "./dist/cluster/index.js": 3965319603
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/k3s",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "type": "module",
   "files": [
     "dist"
@@ -21,16 +21,16 @@
     "@pulumi/command": "^1.0.2",
     "@pulumi/kubernetes": "^4.18.0",
     "remeda": "^2.21.0",
-    "@highstate/common": "0.18.0",
-    "@highstate/contract": "0.18.0",
-    "@highstate/k8s": "0.18.0",
-    "@highstate/library": "0.18.0",
-    "@highstate/pulumi": "0.18.0"
+    "@highstate/common": "0.20.0",
+    "@highstate/k8s": "0.20.0",
+    "@highstate/contract": "0.20.0",
+    "@highstate/library": "0.20.0",
+    "@highstate/pulumi": "0.20.0"
   },
   "devDependencies": {
     "@biomejs/biome": "2.2.0",
     "@typescript/native-preview": "^7.0.0-dev.20250920.1",
-    "@highstate/cli": "0.18.0"
+    "@highstate/cli": "0.20.0"
   },
   "repository": {
     "url": "https://github.com/highstate-io/highstate"