@highstate/k8s 0.8.0 → 0.9.1

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.
Files changed (5) hide show
  1. package/dist/highstate.manifest.json +6 -6
  2. package/dist/units/existing-cluster/index.js +7 -2
  3. package/dist/units/existing-cluster/index.js.map +1 -1
  4. package/package.json +9 -9
  5. package/src/units/existing-cluster/index.ts +5 -0
package/dist/highstate.manifest.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "sourceHashes": {
3
- "./dist/index.js": "90fd5590cd26a08a003e357e079a5fdecebf38a29561ae1dcfa98d51673c31a0",
4
- "./dist/units/access-point/index.js": "7036a8ed35ee76bdb4025e243a3acb16287e813c9a01c8ddbce17b68c087d992",
5
- "./dist/units/cert-manager/index.js": "267268577ca9c88a78652b9887d1b1e555907f950817b42d11c4e561310b2072",
6
- "./dist/units/dns01-issuer/index.js": "28bee64516a7c6e7a94bdb7d6318380a0fcc266b5be998d69477184de3bc267b",
7
- "./dist/units/existing-cluster/index.js": "e106673616cd39447dacb5bc72352ed7593f6794d0d6272127d501d55e76b0d1",
8
- "./dist/units/gateway-api/index.js": "e1abb98528abb976f29d5f6dbfa68c4a8f71e7223a897346a456858194eaa21e"
3
+ "./dist/index.js": "a7fb50ae4b8e23bfdc1d3c634bd754f93fa4a2e931beeea6ca21a54e11b86c7e",
4
+ "./dist/units/access-point/index.js": "784375a9748d1eaaf019d98ad5f62ffe1400a4f75ba2dc894de5322fc5d2a02c",
5
+ "./dist/units/cert-manager/index.js": "62e55a577501f7ab589a25bcc3854bc5d1f0b976c78681cf2221b4f9db458e95",
6
+ "./dist/units/dns01-issuer/index.js": "2546765d9750790be1c016d8f4f9abcf80518efba6e5ca7273150a3c8ee9e096",
7
+ "./dist/units/existing-cluster/index.js": "c05e4620f2e1757ba4fc31f32fac91307dfba2d88b39a690383041deaeac4860",
8
+ "./dist/units/gateway-api/index.js": "65b4924c24e2f2b83e0fd28c025376867ae530296170411871b710f5e3d7bfb0"
9
9
  }
10
10
  }
package/dist/units/existing-cluster/index.js CHANGED
@@ -27,14 +27,19 @@ var existing_cluster_default = outputs({
27
27
  id: kubeSystem.metadata.uid,
28
28
  name,
29
29
  cni,
30
- externalIps
30
+ externalIps,
31
+ tunDevicePolicy: args.tunDevicePolicy
31
32
  },
32
33
  kubeconfig: secret(kubeconfigContent)
33
34
  },
34
35
  $terminals: [createK8sTerminal(kubeconfigContent)],
35
36
  $status: {
36
37
  clusterId: kubeSystem.metadata.uid,
37
- cni: cni ?? "unknown"
38
+ cni: cni ?? "unknown",
39
+ externalIps: {
40
+ value: externalIps.join(", "),
41
+ complementaryTo: "externalIps"
42
+ }
38
43
  }
39
44
  });
40
45
  export {
package/dist/units/existing-cluster/index.js.map CHANGED
@@ -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 = 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 },\n kubeconfig: secret(kubeconfigContent),\n },\n\n $terminals: [createK8sTerminal(kubeconfigContent)],\n\n $status: {\n clusterId: kubeSystem.metadata.uid,\n cni: cni ?? \"unknown\",\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,cAAc,MAAM,kBAAkB,YAAY,KAAK,iBAAiB;AAE9E,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,IACF;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,EACd;AACF,CAAC;","names":[]}
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 = 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,cAAc,MAAM,kBAAkB,YAAY,KAAK,iBAAiB;AAE9E,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.8.0",
3
+ "version": "0.9.1",
4
4
  "type": "module",
5
5
  "files": [
6
6
  "dist",
@@ -26,15 +26,15 @@
26
26
  "generate-crds": "./scripts/generate-crds.sh"
27
27
  },
28
28
  "dependencies": {
29
- "@highstate/cert-manager": "^0.8.0",
30
- "@highstate/common": "^0.8.0",
31
- "@highstate/contract": "^0.8.0",
32
- "@highstate/gateway-api": "^0.8.0",
33
- "@highstate/pulumi": "^0.8.0",
29
+ "@highstate/cert-manager": "^0.9.1",
30
+ "@highstate/common": "^0.9.1",
31
+ "@highstate/contract": "^0.9.1",
32
+ "@highstate/gateway-api": "^0.9.1",
33
+ "@highstate/pulumi": "^0.9.1",
34
34
  "@kubernetes/client-node": "^1.1.0",
35
35
  "@pulumi/command": "^1.0.2",
36
36
  "@pulumi/kubernetes": "^4.18.0",
37
- "@pulumi/pulumi": "^3.163.0",
37
+ "@pulumi/pulumi": "^3.165.0",
38
38
  "crypto-hash": "^3.1.0",
39
39
  "deepmerge-ts": "^7.1.5",
40
40
  "glob": "^11.0.1",
@@ -46,7 +46,7 @@
46
46
  "@highstate/library": "workspace:^0.4.4"
47
47
  },
48
48
  "devDependencies": {
49
- "@highstate/cli": "^0.8.0"
49
+ "@highstate/cli": "^0.9.1"
50
50
  },
51
- "gitHead": "8590eea089a016c9b4b797299fc94ddc9afe10ba"
51
+ "gitHead": "2f9fdd9542fbdd11d4337fb59ac4f5728535fa0c"
52
52
  }
package/src/units/existing-cluster/index.ts CHANGED
@@ -37,6 +37,7 @@ export default outputs({
37
37
  name,
38
38
  cni,
39
39
  externalIps,
40
+ tunDevicePolicy: args.tunDevicePolicy,
40
41
  },
41
42
  kubeconfig: secret(kubeconfigContent),
42
43
  },
@@ -46,5 +47,9 @@ export default outputs({
46
47
  $status: {
47
48
  clusterId: kubeSystem.metadata.uid,
48
49
  cni: cni ?? "unknown",
50
+ externalIps: {
51
+ value: externalIps.join(", "),
52
+ complementaryTo: "externalIps",
53
+ },
49
54
  },
50
55
  })