@highstate/k3s 0.7.0 → 0.7.2

package/dist/cluster/index.js

@@ -1,57 +1,8 @@
-import { remote } from '@pulumi/command';
-import { output, forUnit, all } from '@highstate/pulumi';
+import { Server } from '@highstate/common';
+import { text } from '@highstate/contract';
 import { k3s } from '@highstate/library';
-
-function getServerConnection(server) {
-  return output(server).apply((server2) => ({
-    host: server2.endpoint,
-    port: server2.sshCredentials?.port ?? 22,
-    user: server2.sshCredentials?.user ?? "root",
-    password: server2.sshCredentials?.password,
-    privateKey: server2.sshCredentials?.privateKey,
-    dialErrorLimit: 3
-  }));
-}
-class Server {
-  server;
-  connection;
-  get endpoint() {
-    return this.server.endpoint;
-  }
-  get hostname() {
-    return this.server.hostname;
-  }
-  constructor(server) {
-    this.server = output(server);
-    this.connection = getServerConnection(this.server);
-  }
-  command(options) {
-    return new remote.Command(
-      options.id,
-      {
-        connection: this.connection,
-        create: options.create,
-        update: options.update,
-        delete: options.delete
-      },
-      { dependsOn: options.dependsOn }
-    );
-  }
-}
-
-function text(array, ...values) {
-  const str = array.reduce(
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
-    (result, part, i) => result + part + (values[i] ? String(values[i]) : ""),
-    ""
-  );
-  return trimIndentation(str);
-}
-function trimIndentation(text2) {
-  const lines = text2.split("\n");
-  const indent = lines.filter((line) => line.trim() !== "").map((line) => line.match(/^\s*/)?.[0].length ?? 0).reduce((min, indent2) => Math.min(min, indent2), Infinity);
-  return lines.map((line) => line.slice(indent)).join("\n").trim();
-}
+import { forUnit, all } from '@highstate/pulumi';
+import { Provider, core } from '@pulumi/kubernetes';
 
 const { name, inputs, outputs } = forUnit(k3s.cluster);
 const server = new Server(inputs.server);
@@ -65,11 +16,15 @@ const kubeconfigCommand = server.command({
   dependsOn: k3sCommand
 });
 const kubeconfig = all([kubeconfigCommand.stdout, server.endpoint]).apply(([kubeconfig2, endpoint]) => kubeconfig2.replace("127.0.0.1", endpoint));
+const provider = new Provider(name, { kubeconfig });
+const kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider });
 var index = outputs({
   k8sCluster: {
-    name,
-    kubeconfig,
-    cni: "unknown"
+    info: {
+      id: kubeSystem.metadata.uid,
+      name
+    },
+    kubeconfig
   },
   $terminals: {
     kubectl: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/k3s",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "type": "module",
   "files": [
     "dist"
@@ -16,8 +16,11 @@
     "generate-cilium": "bash ./scripts/generate-cilium.sh"
   },
   "dependencies": {
-    "@highstate/pulumi": "^0.7.0",
-    "@pulumi/command": "^1.0.2"
+    "@highstate/common": "^0.7.2",
+    "@highstate/contract": "^0.7.2",
+    "@highstate/pulumi": "^0.7.2",
+    "@pulumi/command": "^1.0.2",
+    "@pulumi/kubernetes": "^4.18.0"
   },
   "peerDependencies": {
     "@highstate/library": "workspace:^0.4.4"
@@ -25,5 +28,5 @@
   "devDependencies": {
     "pkgroll": "^2.5.1"
   },
-  "gitHead": "2f5227f7b88cf38946e490fc4cdb96127bd8b174"
+  "gitHead": "e177535015e0fa3c74ae8ddc0bc6d31b191d2c54"
 }