@highstate/k3s 0.7.11 → 0.8.0
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.
package/dist/cluster/index.js
CHANGED
|
@@ -1,19 +1,27 @@
|
|
|
1
1
|
// src/cluster/index.ts
|
|
2
|
-
import { Server } from "@highstate/common";
|
|
2
|
+
import { DnsRecord, Server } from "@highstate/common";
|
|
3
3
|
import { k3s } from "@highstate/library";
|
|
4
|
-
import { all, forUnit, secret, toPromise } from "@highstate/pulumi";
|
|
4
|
+
import { all, forUnit, output, secret, toPromise } from "@highstate/pulumi";
|
|
5
5
|
import { KubeConfig } from "@kubernetes/client-node";
|
|
6
6
|
import { core, Provider } from "@pulumi/kubernetes";
|
|
7
7
|
import { createK8sTerminal, detectExternalIps } from "@highstate/k8s";
|
|
8
8
|
var { name, args, inputs, outputs } = forUnit(k3s.cluster);
|
|
9
9
|
var server = new Server(inputs.server);
|
|
10
|
+
var configFile = server.file({
|
|
11
|
+
id: "config",
|
|
12
|
+
path: "/etc/rancher/k3s/config.yaml",
|
|
13
|
+
content: output(args.config).apply((config) => config ?? {}).apply(JSON.stringify)
|
|
14
|
+
});
|
|
10
15
|
var k3sCommand = server.command({
|
|
11
16
|
id: "k3s",
|
|
12
|
-
create: "curl -sfL https://get.k3s.io | sh -"
|
|
17
|
+
create: "curl -sfL https://get.k3s.io | sh -",
|
|
18
|
+
delete: "/usr/local/bin/k3s-uninstall.sh",
|
|
19
|
+
dependsOn: configFile
|
|
13
20
|
});
|
|
14
21
|
var kubeconfigCommand = server.command({
|
|
15
22
|
id: "kubeconfig",
|
|
16
23
|
create: "cat /etc/rancher/k3s/k3s.yaml",
|
|
24
|
+
logging: "stderr",
|
|
17
25
|
dependsOn: k3sCommand
|
|
18
26
|
});
|
|
19
27
|
var kubeconfig = await toPromise(
|
|
@@ -24,12 +32,22 @@ kubeConfig.loadFromString(kubeconfig);
|
|
|
24
32
|
var externalIps = await detectExternalIps(kubeConfig, args.internalIpsPolicy);
|
|
25
33
|
var provider = new Provider(name, { kubeconfig: secret(kubeconfig) });
|
|
26
34
|
var kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider });
|
|
35
|
+
if (args.registerFqdn && args.fqdn) {
|
|
36
|
+
DnsRecord.createSet(args.fqdn, {
|
|
37
|
+
providers: inputs.dnsProviders,
|
|
38
|
+
type: "A",
|
|
39
|
+
value: externalIps[0]
|
|
40
|
+
});
|
|
41
|
+
}
|
|
27
42
|
var cluster_default = outputs({
|
|
28
43
|
k8sCluster: {
|
|
29
44
|
info: {
|
|
30
45
|
id: kubeSystem.metadata.uid,
|
|
31
46
|
name,
|
|
32
|
-
externalIps
|
|
47
|
+
externalIps,
|
|
48
|
+
fqdn: args.fqdn,
|
|
49
|
+
kubeApiServerIp: externalIps[0],
|
|
50
|
+
kubeApiServerPort: 6443
|
|
33
51
|
},
|
|
34
52
|
kubeconfig: secret(kubeconfig)
|
|
35
53
|
},
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"sources":["../../src/cluster/index.ts"],"sourcesContent":["import { DnsRecord, Server } from \"@highstate/common\"\nimport { k3s } from \"@highstate/library\"\nimport { all, forUnit, output, 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 configFile = server.file({\n id: \"config\",\n path: \"/etc/rancher/k3s/config.yaml\",\n content: output(args.config)\n .apply(config => config ?? {})\n .apply(JSON.stringify),\n})\n\nconst k3sCommand = server.command({\n id: \"k3s\",\n create: \"curl -sfL https://get.k3s.io | sh -\",\n delete: \"/usr/local/bin/k3s-uninstall.sh\",\n dependsOn: configFile,\n})\n\nconst kubeconfigCommand = server.command({\n id: \"kubeconfig\",\n create: \"cat /etc/rancher/k3s/k3s.yaml\",\n logging: \"stderr\",\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\nif (args.registerFqdn && args.fqdn) {\n DnsRecord.createSet(args.fqdn, {\n providers: inputs.dnsProviders,\n type: \"A\",\n value: externalIps[0],\n })\n}\n\nexport default outputs({\n k8sCluster: {\n info: {\n id: kubeSystem.metadata.uid,\n name,\n externalIps,\n fqdn: args.fqdn,\n kubeApiServerIp: externalIps[0],\n kubeApiServerPort: 6443,\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,WAAW,cAAc;AAClC,SAAS,WAAW;AACpB,SAAS,KAAK,SAAS,QAAQ,QAAQ,iBAAiB;AACxD,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,KAAK;AAAA,EAC7B,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,SAAS,OAAO,KAAK,MAAM,EACxB,MAAM,YAAU,UAAU,CAAC,CAAC,EAC5B,MAAM,KAAK,SAAS;AACzB,CAAC;AAED,IAAM,aAAa,OAAO,QAAQ;AAAA,EAChC,IAAI;AAAA,EACJ,QAAQ;AAAA,EACR,QAAQ;AAAA,EACR,WAAW;AACb,CAAC;AAED,IAAM,oBAAoB,OAAO,QAAQ;AAAA,EACvC,IAAI;AAAA,EACJ,QAAQ;AAAA,EACR,SAAS;AAAA,EACT,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,IAAI,KAAK,gBAAgB,KAAK,MAAM;AAClC,YAAU,UAAU,KAAK,MAAM;AAAA,IAC7B,WAAW,OAAO;AAAA,IAClB,MAAM;AAAA,IACN,OAAO,YAAY,CAAC;AAAA,EACtB,CAAC;AACH;AAEA,IAAO,kBAAQ,QAAQ;AAAA,EACrB,YAAY;AAAA,IACV,MAAM;AAAA,MACJ,IAAI,WAAW,SAAS;AAAA,MACxB;AAAA,MACA;AAAA,MACA,MAAM,KAAK;AAAA,MACX,iBAAiB,YAAY,CAAC;AAAA,MAC9B,mBAAmB;AAAA,IACrB;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"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@highstate/k3s",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist"
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
"build": "highstate build"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@highstate/common": "^0.
|
|
19
|
-
"@highstate/contract": "^0.
|
|
20
|
-
"@highstate/k8s": "^0.
|
|
21
|
-
"@highstate/pulumi": "^0.
|
|
18
|
+
"@highstate/common": "^0.8.0",
|
|
19
|
+
"@highstate/contract": "^0.8.0",
|
|
20
|
+
"@highstate/k8s": "^0.8.0",
|
|
21
|
+
"@highstate/pulumi": "^0.8.0",
|
|
22
22
|
"@kubernetes/client-node": "^1.1.0",
|
|
23
23
|
"@pulumi/command": "^1.0.2",
|
|
24
24
|
"@pulumi/kubernetes": "^4.18.0"
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@highstate/library": "workspace:^0.4.4"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@highstate/cli": "^0.
|
|
30
|
+
"@highstate/cli": "^0.8.0"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "8590eea089a016c9b4b797299fc94ddc9afe10ba"
|
|
33
33
|
}
|