@highstate/k3s 0.7.9 → 0.7.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,10 +1,11 @@
1
1
  // src/cluster/index.ts
2
2
  import { Server } from "@highstate/common";
3
- import { text } from "@highstate/contract";
4
3
  import { k3s } from "@highstate/library";
5
- import { all, forUnit } from "@highstate/pulumi";
4
+ import { all, forUnit, secret, toPromise } from "@highstate/pulumi";
5
+ import { KubeConfig } from "@kubernetes/client-node";
6
6
  import { core, Provider } from "@pulumi/kubernetes";
7
- var { name, inputs, outputs } = forUnit(k3s.cluster);
7
+ import { createK8sTerminal, detectExternalIps } from "@highstate/k8s";
8
+ var { name, args, inputs, outputs } = forUnit(k3s.cluster);
8
9
  var server = new Server(inputs.server);
9
10
  var k3sCommand = server.command({
10
11
  id: "k3s",
@@ -15,38 +16,28 @@ var kubeconfigCommand = server.command({
15
16
  create: "cat /etc/rancher/k3s/k3s.yaml",
16
17
  dependsOn: k3sCommand
17
18
  });
18
- var kubeconfig = all([kubeconfigCommand.stdout, server.endpoint]).apply(([kubeconfig2, endpoint]) => kubeconfig2.replace("127.0.0.1", endpoint));
19
- var provider = new Provider(name, { kubeconfig });
19
+ var kubeconfig = await toPromise(
20
+ all([kubeconfigCommand.stdout, server.endpoint]).apply(([kubeconfig2, endpoint]) => kubeconfig2.replace("127.0.0.1", endpoint))
21
+ );
22
+ var kubeConfig = new KubeConfig();
23
+ kubeConfig.loadFromString(kubeconfig);
24
+ var externalIps = await detectExternalIps(kubeConfig, args.internalIpsPolicy);
25
+ var provider = new Provider(name, { kubeconfig: secret(kubeconfig) });
20
26
  var kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider });
21
27
  var cluster_default = outputs({
22
28
  k8sCluster: {
23
29
  info: {
24
30
  id: kubeSystem.metadata.uid,
25
31
  name,
26
- externalIps: []
32
+ externalIps
27
33
  },
28
- kubeconfig
34
+ kubeconfig: secret(kubeconfig)
29
35
  },
30
- $terminals: {
31
- kubectl: {
32
- title: "Kubectl",
33
- image: "ghcr.io/exeteres/highstate/terminal-kubectl",
34
- command: ["bash", "/welcome.sh"],
35
- files: {
36
- "/kubeconfig": kubeconfig,
37
- "/welcome.sh": text`
38
- echo "Connecting to the cluster..."
39
- kubectl cluster-info
40
-
41
- echo "Use 'kubectl' and 'helm' to manage the cluster."
42
- echo
43
-
44
- exec script -q -c bash /dev/null
45
- `
46
- },
47
- env: {
48
- KUBECONFIG: "/kubeconfig"
49
- }
36
+ $terminals: [createK8sTerminal(kubeconfig)],
37
+ $status: {
38
+ externalIps: {
39
+ value: externalIps.join(", "),
40
+ complementaryTo: "externalIps"
50
41
  }
51
42
  }
52
43
  });
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/cluster/index.ts"],"sourcesContent":["import { Server } from \"@highstate/common\"\nimport { text } from \"@highstate/contract\"\nimport { k3s } from \"@highstate/library\"\nimport { all, forUnit } from \"@highstate/pulumi\"\nimport { core, Provider } from \"@pulumi/kubernetes\"\n\nconst { name, inputs, outputs } = forUnit(k3s.cluster)\n\nconst server = new Server(inputs.server)\n\nconst k3sCommand = server.command({\n id: \"k3s\",\n create: \"curl -sfL https://get.k3s.io | sh -\",\n})\n\nconst kubeconfigCommand = server.command({\n id: \"kubeconfig\",\n create: \"cat /etc/rancher/k3s/k3s.yaml\",\n dependsOn: k3sCommand,\n})\n\nconst kubeconfig = all([kubeconfigCommand.stdout, server.endpoint])\n //\n .apply(([kubeconfig, endpoint]) => kubeconfig.replace(\"127.0.0.1\", endpoint))\n\nconst provider = new Provider(name, { kubeconfig })\nconst kubeSystem = core.v1.Namespace.get(\"kube-system\", \"kube-system\", { provider })\n\nexport default outputs({\n k8sCluster: {\n info: {\n id: kubeSystem.metadata.uid,\n name,\n externalIps: [],\n },\n kubeconfig,\n },\n $terminals: {\n kubectl: {\n title: \"Kubectl\",\n image: \"ghcr.io/exeteres/highstate/terminal-kubectl\",\n command: [\"bash\", \"/welcome.sh\"],\n files: {\n \"/kubeconfig\": kubeconfig,\n\n \"/welcome.sh\": text`\n echo \"Connecting to the cluster...\"\n kubectl cluster-info\n\n echo \"Use 'kubectl' and 'helm' to manage the cluster.\"\n echo\n\n exec script -q -c bash /dev/null\n `,\n },\n env: {\n KUBECONFIG: \"/kubeconfig\",\n },\n },\n },\n})\n"],"mappings":";AAAA,SAAS,cAAc;AACvB,SAAS,YAAY;AACrB,SAAS,WAAW;AACpB,SAAS,KAAK,eAAe;AAC7B,SAAS,MAAM,gBAAgB;AAE/B,IAAM,EAAE,MAAM,QAAQ,QAAQ,IAAI,QAAQ,IAAI,OAAO;AAErD,IAAM,SAAS,IAAI,OAAO,OAAO,MAAM;AAEvC,IAAM,aAAa,OAAO,QAAQ;AAAA,EAChC,IAAI;AAAA,EACJ,QAAQ;AACV,CAAC;AAED,IAAM,oBAAoB,OAAO,QAAQ;AAAA,EACvC,IAAI;AAAA,EACJ,QAAQ;AAAA,EACR,WAAW;AACb,CAAC;AAED,IAAM,aAAa,IAAI,CAAC,kBAAkB,QAAQ,OAAO,QAAQ,CAAC,EAE/D,MAAM,CAAC,CAACA,aAAY,QAAQ,MAAMA,YAAW,QAAQ,aAAa,QAAQ,CAAC;AAE9E,IAAM,WAAW,IAAI,SAAS,MAAM,EAAE,WAAW,CAAC;AAClD,IAAM,aAAa,KAAK,GAAG,UAAU,IAAI,eAAe,eAAe,EAAE,SAAS,CAAC;AAEnF,IAAO,kBAAQ,QAAQ;AAAA,EACrB,YAAY;AAAA,IACV,MAAM;AAAA,MACJ,IAAI,WAAW,SAAS;AAAA,MACxB;AAAA,MACA,aAAa,CAAC;AAAA,IAChB;AAAA,IACA;AAAA,EACF;AAAA,EACA,YAAY;AAAA,IACV,SAAS;AAAA,MACP,OAAO;AAAA,MACP,OAAO;AAAA,MACP,SAAS,CAAC,QAAQ,aAAa;AAAA,MAC/B,OAAO;AAAA,QACL,eAAe;AAAA,QAEf,eAAe;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MASjB;AAAA,MACA,KAAK;AAAA,QACH,YAAY;AAAA,MACd;AAAA,IACF;AAAA,EACF;AACF,CAAC;","names":["kubeconfig"]}
1
+ {"version":3,"sources":["../../src/cluster/index.ts"],"sourcesContent":["import { Server } from \"@highstate/common\"\nimport { k3s } from \"@highstate/library\"\nimport { all, forUnit, secret, toPromise } from \"@highstate/pulumi\"\nimport { KubeConfig } from \"@kubernetes/client-node\"\nimport { core, Provider } from \"@pulumi/kubernetes\"\nimport { createK8sTerminal, detectExternalIps } from \"@highstate/k8s\"\n\nconst { name, args, inputs, outputs } = forUnit(k3s.cluster)\n\nconst server = new Server(inputs.server)\n\nconst k3sCommand = server.command({\n id: \"k3s\",\n create: \"curl -sfL https://get.k3s.io | sh -\",\n})\n\nconst kubeconfigCommand = server.command({\n id: \"kubeconfig\",\n create: \"cat /etc/rancher/k3s/k3s.yaml\",\n dependsOn: k3sCommand,\n})\n\nconst kubeconfig = await toPromise(\n all([kubeconfigCommand.stdout, server.endpoint])\n //\n .apply(([kubeconfig, endpoint]) => kubeconfig.replace(\"127.0.0.1\", endpoint)),\n)\n\nconst kubeConfig = new KubeConfig()\nkubeConfig.loadFromString(kubeconfig)\n\nconst externalIps = await detectExternalIps(kubeConfig, args.internalIpsPolicy)\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 info: {\n id: kubeSystem.metadata.uid,\n name,\n externalIps,\n },\n kubeconfig: secret(kubeconfig),\n },\n $terminals: [createK8sTerminal(kubeconfig)],\n $status: {\n externalIps: {\n value: externalIps.join(\", \"),\n complementaryTo: \"externalIps\",\n },\n },\n})\n"],"mappings":";AAAA,SAAS,cAAc;AACvB,SAAS,WAAW;AACpB,SAAS,KAAK,SAAS,QAAQ,iBAAiB;AAChD,SAAS,kBAAkB;AAC3B,SAAS,MAAM,gBAAgB;AAC/B,SAAS,mBAAmB,yBAAyB;AAErD,IAAM,EAAE,MAAM,MAAM,QAAQ,QAAQ,IAAI,QAAQ,IAAI,OAAO;AAE3D,IAAM,SAAS,IAAI,OAAO,OAAO,MAAM;AAEvC,IAAM,aAAa,OAAO,QAAQ;AAAA,EAChC,IAAI;AAAA,EACJ,QAAQ;AACV,CAAC;AAED,IAAM,oBAAoB,OAAO,QAAQ;AAAA,EACvC,IAAI;AAAA,EACJ,QAAQ;AAAA,EACR,WAAW;AACb,CAAC;AAED,IAAM,aAAa,MAAM;AAAA,EACvB,IAAI,CAAC,kBAAkB,QAAQ,OAAO,QAAQ,CAAC,EAE5C,MAAM,CAAC,CAACA,aAAY,QAAQ,MAAMA,YAAW,QAAQ,aAAa,QAAQ,CAAC;AAChF;AAEA,IAAM,aAAa,IAAI,WAAW;AAClC,WAAW,eAAe,UAAU;AAEpC,IAAM,cAAc,MAAM,kBAAkB,YAAY,KAAK,iBAAiB;AAE9E,IAAM,WAAW,IAAI,SAAS,MAAM,EAAE,YAAY,OAAO,UAAU,EAAE,CAAC;AACtE,IAAM,aAAa,KAAK,GAAG,UAAU,IAAI,eAAe,eAAe,EAAE,SAAS,CAAC;AAEnF,IAAO,kBAAQ,QAAQ;AAAA,EACrB,YAAY;AAAA,IACV,MAAM;AAAA,MACJ,IAAI,WAAW,SAAS;AAAA,MACxB;AAAA,MACA;AAAA,IACF;AAAA,IACA,YAAY,OAAO,UAAU;AAAA,EAC/B;AAAA,EACA,YAAY,CAAC,kBAAkB,UAAU,CAAC;AAAA,EAC1C,SAAS;AAAA,IACP,aAAa;AAAA,MACX,OAAO,YAAY,KAAK,IAAI;AAAA,MAC5B,iBAAiB;AAAA,IACnB;AAAA,EACF;AACF,CAAC;","names":["kubeconfig"]}
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "sourceHashes": {
3
- "./dist/cluster/index.js": "4c441f541367eb983a181ee475773103fee97bba28d7399687714b2e33008f70"
3
+ "./dist/cluster/index.js": "ccbd83e15ff46ff1a23722074b49744e5a9137a7d8a11644318b4cffe581217d"
4
4
  }
5
5
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@highstate/k3s",
3
- "version": "0.7.9",
3
+ "version": "0.7.10",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "dist"
@@ -15,9 +15,11 @@
15
15
  "build": "highstate build"
16
16
  },
17
17
  "dependencies": {
18
- "@highstate/common": "^0.7.9",
19
- "@highstate/contract": "^0.7.9",
20
- "@highstate/pulumi": "^0.7.9",
18
+ "@highstate/common": "^0.7.10",
19
+ "@highstate/contract": "^0.7.10",
20
+ "@highstate/k8s": "^0.7.10",
21
+ "@highstate/pulumi": "^0.7.10",
22
+ "@kubernetes/client-node": "^1.1.0",
21
23
  "@pulumi/command": "^1.0.2",
22
24
  "@pulumi/kubernetes": "^4.18.0"
23
25
  },
@@ -25,7 +27,7 @@
25
27
  "@highstate/library": "workspace:^0.4.4"
26
28
  },
27
29
  "devDependencies": {
28
- "@highstate/cli": "^0.7.9"
30
+ "@highstate/cli": "^0.7.10"
29
31
  },
30
- "gitHead": "339633006df48d9ed3fcc181c8c4279d3dc1a12c"
32
+ "gitHead": "171465dab44ebcedd1d1eb9e5369fb1c88daa480"
31
33
  }