@highstate/talos 0.7.0 → 0.7.2
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 +10 -5
- package/package.json +8 -7
package/dist/cluster/index.js
CHANGED
|
@@ -4,6 +4,7 @@ import { talos } from '@highstate/library';
|
|
|
4
4
|
import { machine, cluster } from '@pulumiverse/talos';
|
|
5
5
|
import { text } from '@highstate/contract';
|
|
6
6
|
import { RenderedChart } from '@highstate/k8s';
|
|
7
|
+
import { Provider, core } from '@pulumi/kubernetes';
|
|
7
8
|
|
|
8
9
|
const { name, args, inputs, outputs } = forUnit(talos.cluster);
|
|
9
10
|
const cni = args.cni ?? "cilium";
|
|
@@ -15,9 +16,8 @@ if (cni === "cilium") {
|
|
|
15
16
|
`import("@highstate/cilium/charts.json", { with: { type: "json" } })`
|
|
16
17
|
);
|
|
17
18
|
const cilium = new RenderedChart("cilium", {
|
|
18
|
-
charts: charts.default,
|
|
19
|
-
chart: "cilium",
|
|
20
19
|
namespace: "kube-system",
|
|
20
|
+
chart: charts.default.cilium,
|
|
21
21
|
values: {
|
|
22
22
|
"ipam.mode": "kubernetes",
|
|
23
23
|
// "kubeProxyReplacement": "true",
|
|
@@ -159,11 +159,16 @@ function getConfigurationApplyArgs(node, machineConfiguration) {
|
|
|
159
159
|
]
|
|
160
160
|
};
|
|
161
161
|
}
|
|
162
|
+
const provider = new Provider(name, { kubeconfig });
|
|
163
|
+
const kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider });
|
|
162
164
|
var index = outputs({
|
|
163
165
|
k8sCluster: {
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
166
|
+
info: {
|
|
167
|
+
id: kubeSystem.metadata.uid,
|
|
168
|
+
name: clusterName,
|
|
169
|
+
cni: cni === "none" ? void 0 : cni
|
|
170
|
+
},
|
|
171
|
+
kubeconfig
|
|
167
172
|
},
|
|
168
173
|
talosCluster: {
|
|
169
174
|
clientConfiguration,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@highstate/talos",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"files": [
|
|
6
6
|
"assets",
|
|
@@ -17,12 +17,13 @@
|
|
|
17
17
|
"update-assets": "./scripts/update-assets.sh"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@highstate/cilium": "^0.7.
|
|
21
|
-
"@highstate/common": "^0.7.
|
|
22
|
-
"@highstate/contract": "^0.7.
|
|
23
|
-
"@highstate/k8s": "^0.7.
|
|
24
|
-
"@highstate/pulumi": "^0.7.
|
|
20
|
+
"@highstate/cilium": "^0.7.2",
|
|
21
|
+
"@highstate/common": "^0.7.2",
|
|
22
|
+
"@highstate/contract": "^0.7.2",
|
|
23
|
+
"@highstate/k8s": "^0.7.2",
|
|
24
|
+
"@highstate/pulumi": "^0.7.2",
|
|
25
25
|
"@pulumi/command": "^1.0.2",
|
|
26
|
+
"@pulumi/kubernetes": "^4.18.0",
|
|
26
27
|
"@pulumiverse/talos": "^0.4.1"
|
|
27
28
|
},
|
|
28
29
|
"peerDependencies": {
|
|
@@ -31,5 +32,5 @@
|
|
|
31
32
|
"devDependencies": {
|
|
32
33
|
"pkgroll": "^2.5.1"
|
|
33
34
|
},
|
|
34
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "e177535015e0fa3c74ae8ddc0bc6d31b191d2c54"
|
|
35
36
|
}
|