@highstate/talos 0.6.2 → 0.7.1

package/dist/cluster/index.js

@@ -1,9 +1,10 @@
-import { forUnit, readResolvedPackageFileSync, output, interpolate, all } from '@highstate/pulumi';
+import { readFile } from 'node:fs/promises';
+import { forUnit, output, interpolate, all } from '@highstate/pulumi';
 import { talos } from '@highstate/library';
 import { machine, cluster } from '@pulumiverse/talos';
 import { text } from '@highstate/contract';
-import { local } from '@pulumi/command';
-import { resolveChartPath } from '@highstate/k8s';
+import { RenderedChart } from '@highstate/k8s';
+import { Provider, core } from '@pulumi/kubernetes';
 
 const { name, args, inputs, outputs } = forUnit(talos.cluster);
 const cni = args.cni ?? "cilium";
@@ -11,30 +12,31 @@ const csi = args.csi ?? "local-path-provisioner";
 const inlineManifests = [];
 const extraMounts = [];
 if (cni === "cilium") {
-  const ciliumManifestCommand = new local.Command("cilium-manifest", {
-    create: [
-      "helm template",
-      resolveChartPath("@highstate/cilium", "cilium", import.meta.url),
-      "--namespace kube-system",
-      "--set ipam.mode=kubernetes",
-      // "--set kubeProxyReplacement=true",
-      "--set kubeProxyReplacement=false",
-      "--set operator.replicas=1",
-      "--set hubble.relay.enabled=true",
-      "--set hubble.ui.enabled=true",
-      '--set securityContext.capabilities.ciliumAgent="{CHOWN,KILL,NET_ADMIN,NET_RAW,IPC_LOCK,SYS_ADMIN,SYS_RESOURCE,DAC_OVERRIDE,FOWNER,SETGID,SETUID}"',
-      '--set securityContext.capabilities.cleanCiliumState="{NET_ADMIN,SYS_ADMIN,SYS_RESOURCE}"',
-      "--set cgroup.autoMount.enabled=false",
-      "--set cgroup.hostRoot=/sys/fs/cgroup"
-      // "--set k8sServiceHost=localhost",
-      // "--set k8sServicePort=7445",
-      // "--set bpf.lbExternalClusterIP=true"
-    ].join(" "),
-    logging: "stderr"
+  const charts = await eval(
+    `import("@highstate/cilium/charts.json", { with: { type: "json" } })`
+  );
+  const cilium = new RenderedChart("cilium", {
+    namespace: "kube-system",
+    chart: charts.default.cilium,
+    values: {
+      "ipam.mode": "kubernetes",
+      // "kubeProxyReplacement": "true",
+      kubeProxyReplacement: "false",
+      "operator.replicas": "1",
+      "hubble.relay.enabled": "true",
+      "hubble.ui.enabled": "true",
+      "securityContext.capabilities.ciliumAgent": "{CHOWN,KILL,NET_ADMIN,NET_RAW,IPC_LOCK,SYS_ADMIN,SYS_RESOURCE,DAC_OVERRIDE,FOWNER,SETGID,SETUID}",
+      "securityContext.capabilities.cleanCiliumState": "{NET_ADMIN,SYS_ADMIN,SYS_RESOURCE}",
+      "cgroup.autoMount.enabled": "false",
+      "cgroup.hostRoot": "/sys/fs/cgroup"
+      // "k8sServiceHost": "localhost",
+      // "k8sServicePort": "7445",
+      // "bpf.lbExternalClusterIP": "true",
+    }
   });
   inlineManifests.push({
     name: "cilium",
-    contents: ciliumManifestCommand.stdout
+    contents: cilium.manifest
   });
 }
 if (csi === "local-path-provisioner") {
@@ -46,11 +48,7 @@ if (csi === "local-path-provisioner") {
   });
   inlineManifests.push({
     name: "local-path-provisioner",
-    contents: readResolvedPackageFileSync(
-      "@highstate/talos/cluster",
-      "assets/local-path-provisioner.yaml",
-      import.meta.url
-    )
+    contents: await readFile("../../assets/local-path-provisioner.yaml", "utf-8")
   });
 }
 const clusterName = args.clusterName ?? name;
@@ -161,11 +159,16 @@ function getConfigurationApplyArgs(node, machineConfiguration) {
     ]
   };
 }
+const provider = new Provider(name, { kubeconfig });
+const kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider });
 var index = outputs({
   k8sCluster: {
-    name: clusterName,
-    kubeconfig,
-    cni: cni === "none" ? "unknown" : cni
+    info: {
+      id: kubeSystem.metadata.uid,
+      name: clusterName,
+      cni: cni === "none" ? void 0 : cni
+    },
+    kubeconfig
   },
   talosCluster: {
     clientConfiguration,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/talos",
-  "version": "0.6.2",
+  "version": "0.7.1",
   "type": "module",
   "files": [
     "assets",
@@ -14,15 +14,16 @@
   },
   "scripts": {
     "build": "pkgroll --tsconfig=tsconfig.build.json",
-    "generate-local-path-provisioner": "bash ./scripts/generate-local-path-provisioner.sh"
+    "update-assets": "./scripts/update-assets.sh"
   },
   "dependencies": {
-    "@highstate/cilium": "^0.6.2",
-    "@highstate/common": "^0.6.2",
-    "@highstate/contract": "^0.6.2",
-    "@highstate/k8s": "^0.6.2",
-    "@highstate/pulumi": "^0.6.2",
+    "@highstate/cilium": "^0.7.1",
+    "@highstate/common": "^0.7.1",
+    "@highstate/contract": "^0.7.1",
+    "@highstate/k8s": "^0.7.1",
+    "@highstate/pulumi": "^0.7.1",
     "@pulumi/command": "^1.0.2",
+    "@pulumi/kubernetes": "^4.18.0",
     "@pulumiverse/talos": "^0.4.1"
   },
   "peerDependencies": {
@@ -31,5 +32,5 @@
   "devDependencies": {
     "pkgroll": "^2.5.1"
   },
-  "gitHead": "dfd1d6878fc7d12954b6591d5ee1783d3c501eca"
+  "gitHead": "76c38ce5dbf7a710cf0e6339f52e86358537a99a"
 }