@highstate/k8s 0.9.3 → 0.9.4
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,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"sourceHashes": {
|
|
3
|
-
"./dist/index.js": "
|
|
4
|
-
"./dist/units/access-point/index.js": "
|
|
5
|
-
"./dist/units/cert-manager/index.js": "
|
|
6
|
-
"./dist/units/dns01-issuer/index.js": "
|
|
7
|
-
"./dist/units/existing-cluster/index.js": "
|
|
8
|
-
"./dist/units/gateway-api/index.js": "
|
|
3
|
+
"./dist/index.js": "1fd051bc2c5f4f4fdbb4f6f8594e79c986ead0a4380d3afbbb5556d407a9bc9b",
|
|
4
|
+
"./dist/units/access-point/index.js": "573732604825cdef60f5797a45147738182b87e45455bec147912cc6c5bd7d83",
|
|
5
|
+
"./dist/units/cert-manager/index.js": "bfc6cc8a1641b086bb87c817a05961c31bb5f51e9b9353ec19903b0157412491",
|
|
6
|
+
"./dist/units/dns01-issuer/index.js": "c3c7952df173b4f1dbb6e7247260f2d26042b91c121d857aaafead0f53c1852d",
|
|
7
|
+
"./dist/units/existing-cluster/index.js": "f1b8d23e15962ad5c38d4875814602b01beca1eb7e47f498ab43f09afbe6604d",
|
|
8
|
+
"./dist/units/gateway-api/index.js": "2f3026f0f7d58ee79acab62421e6713c4d4c0ccee5297160f7305f0f92278014"
|
|
9
9
|
}
|
|
10
10
|
}
|
|
@@ -19,7 +19,7 @@ var isCilium = await appsApi.readNamespacedDaemonSet({ name: "cilium", namespace
|
|
|
19
19
|
if (isCilium) {
|
|
20
20
|
cni = "cilium";
|
|
21
21
|
}
|
|
22
|
-
var externalIps = await detectExternalIps(kubeConfig, args.internalIpsPolicy);
|
|
22
|
+
var externalIps = args.externalIps ?? await detectExternalIps(kubeConfig, args.internalIpsPolicy);
|
|
23
23
|
var kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider });
|
|
24
24
|
var existing_cluster_default = outputs({
|
|
25
25
|
cluster: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/units/existing-cluster/index.ts"],"sourcesContent":["import { k8s } from \"@highstate/library\"\nimport { forUnit, secret, toPromise } from \"@highstate/pulumi\"\nimport { core, Provider } from \"@pulumi/kubernetes\"\nimport { KubeConfig, AppsV1Api } from \"@kubernetes/client-node\"\nimport { createK8sTerminal, detectExternalIps } from \"../../cluster\"\n\nconst { name, args, secrets, outputs } = forUnit(k8s.existingCluster)\n\nconst kubeconfigContent = await toPromise(secrets.kubeconfig.apply(JSON.stringify))\n\nconst provider = new Provider(name, { kubeconfig: kubeconfigContent })\n\nlet cni: string | undefined\n\nconst kubeConfig = new KubeConfig()\nkubeConfig.loadFromString(kubeconfigContent)\n\nconst appsApi = kubeConfig.makeApiClient(AppsV1Api)\n\nconst isCilium = await appsApi\n .readNamespacedDaemonSet({ name: \"cilium\", namespace: \"kube-system\" })\n .then(() => true)\n .catch(() => false)\n\nif (isCilium) {\n cni = \"cilium\"\n}\n\nconst externalIps
|
|
1
|
+
{"version":3,"sources":["../../../src/units/existing-cluster/index.ts"],"sourcesContent":["import { k8s } from \"@highstate/library\"\nimport { forUnit, secret, toPromise } from \"@highstate/pulumi\"\nimport { core, Provider } from \"@pulumi/kubernetes\"\nimport { KubeConfig, AppsV1Api } from \"@kubernetes/client-node\"\nimport { createK8sTerminal, detectExternalIps } from \"../../cluster\"\n\nconst { name, args, secrets, outputs } = forUnit(k8s.existingCluster)\n\nconst kubeconfigContent = await toPromise(secrets.kubeconfig.apply(JSON.stringify))\n\nconst provider = new Provider(name, { kubeconfig: kubeconfigContent })\n\nlet cni: string | undefined\n\nconst kubeConfig = new KubeConfig()\nkubeConfig.loadFromString(kubeconfigContent)\n\nconst appsApi = kubeConfig.makeApiClient(AppsV1Api)\n\nconst isCilium = await appsApi\n .readNamespacedDaemonSet({ name: \"cilium\", namespace: \"kube-system\" })\n .then(() => true)\n .catch(() => false)\n\nif (isCilium) {\n cni = \"cilium\"\n}\n\nconst externalIps =\n args.externalIps ?? (await detectExternalIps(kubeConfig, args.internalIpsPolicy))\n\nconst kubeSystem = core.v1.Namespace.get(\"kube-system\", \"kube-system\", { provider })\n\nexport default outputs({\n cluster: {\n info: {\n id: kubeSystem.metadata.uid,\n name,\n cni,\n externalIps,\n tunDevicePolicy: args.tunDevicePolicy,\n },\n kubeconfig: secret(kubeconfigContent),\n },\n\n $terminals: [createK8sTerminal(kubeconfigContent)],\n\n $status: {\n clusterId: kubeSystem.metadata.uid,\n cni: cni ?? \"unknown\",\n externalIps: {\n value: externalIps.join(\", \"),\n complementaryTo: \"externalIps\",\n },\n },\n})\n"],"mappings":";;;;;;AAAA,SAAS,WAAW;AACpB,SAAS,SAAS,QAAQ,iBAAiB;AAC3C,SAAS,MAAM,gBAAgB;AAC/B,SAAS,YAAY,iBAAiB;AAGtC,IAAM,EAAE,MAAM,MAAM,SAAS,QAAQ,IAAI,QAAQ,IAAI,eAAe;AAEpE,IAAM,oBAAoB,MAAM,UAAU,QAAQ,WAAW,MAAM,KAAK,SAAS,CAAC;AAElF,IAAM,WAAW,IAAI,SAAS,MAAM,EAAE,YAAY,kBAAkB,CAAC;AAErE,IAAI;AAEJ,IAAM,aAAa,IAAI,WAAW;AAClC,WAAW,eAAe,iBAAiB;AAE3C,IAAM,UAAU,WAAW,cAAc,SAAS;AAElD,IAAM,WAAW,MAAM,QACpB,wBAAwB,EAAE,MAAM,UAAU,WAAW,cAAc,CAAC,EACpE,KAAK,MAAM,IAAI,EACf,MAAM,MAAM,KAAK;AAEpB,IAAI,UAAU;AACZ,QAAM;AACR;AAEA,IAAM,cACJ,KAAK,eAAgB,MAAM,kBAAkB,YAAY,KAAK,iBAAiB;AAEjF,IAAM,aAAa,KAAK,GAAG,UAAU,IAAI,eAAe,eAAe,EAAE,SAAS,CAAC;AAEnF,IAAO,2BAAQ,QAAQ;AAAA,EACrB,SAAS;AAAA,IACP,MAAM;AAAA,MACJ,IAAI,WAAW,SAAS;AAAA,MACxB;AAAA,MACA;AAAA,MACA;AAAA,MACA,iBAAiB,KAAK;AAAA,IACxB;AAAA,IACA,YAAY,OAAO,iBAAiB;AAAA,EACtC;AAAA,EAEA,YAAY,CAAC,kBAAkB,iBAAiB,CAAC;AAAA,EAEjD,SAAS;AAAA,IACP,WAAW,WAAW,SAAS;AAAA,IAC/B,KAAK,OAAO;AAAA,IACZ,aAAa;AAAA,MACX,OAAO,YAAY,KAAK,IAAI;AAAA,MAC5B,iBAAiB;AAAA,IACnB;AAAA,EACF;AACF,CAAC;","names":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@highstate/k8s",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"files": [
|
|
6
6
|
"dist",
|
|
@@ -26,12 +26,12 @@
|
|
|
26
26
|
"generate-crds": "./scripts/generate-crds.sh"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@highstate/cert-manager": "^0.9.
|
|
30
|
-
"@highstate/common": "^0.9.
|
|
31
|
-
"@highstate/contract": "^0.9.
|
|
32
|
-
"@highstate/gateway-api": "^0.9.
|
|
33
|
-
"@highstate/library": "^0.9.
|
|
34
|
-
"@highstate/pulumi": "^0.9.
|
|
29
|
+
"@highstate/cert-manager": "^0.9.4",
|
|
30
|
+
"@highstate/common": "^0.9.4",
|
|
31
|
+
"@highstate/contract": "^0.9.4",
|
|
32
|
+
"@highstate/gateway-api": "^0.9.4",
|
|
33
|
+
"@highstate/library": "^0.9.4",
|
|
34
|
+
"@highstate/pulumi": "^0.9.4",
|
|
35
35
|
"@kubernetes/client-node": "^1.1.0",
|
|
36
36
|
"@pulumi/command": "^1.0.2",
|
|
37
37
|
"@pulumi/kubernetes": "^4.18.0",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"remeda": "^2.21.0"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@highstate/cli": "^0.9.
|
|
47
|
+
"@highstate/cli": "^0.9.4"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "021af8cde467823881e2dc82ccb606c9617772ea"
|
|
50
50
|
}
|
|
@@ -26,7 +26,8 @@ if (isCilium) {
|
|
|
26
26
|
cni = "cilium"
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
const externalIps =
|
|
29
|
+
const externalIps =
|
|
30
|
+
args.externalIps ?? (await detectExternalIps(kubeConfig, args.internalIpsPolicy))
|
|
30
31
|
|
|
31
32
|
const kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider })
|
|
32
33
|
|