@highstate/k8s 0.6.2 → 0.7.1

package/dist/shared-Clzbl5K-.js

@@ -0,0 +1,89 @@
+import { output, toPromise } from '@highstate/pulumi';
+import { Provider, core } from '@pulumi/kubernetes';
+import { mergeDeep } from 'remeda';
+
+const providers = /* @__PURE__ */ new Map();
+function getProvider(cluster) {
+  const provider = output(cluster).apply((cluster2) => {
+    const existingProvider = providers.get(cluster2.info.id);
+    if (existingProvider) {
+      return existingProvider;
+    }
+    const provider2 = new Provider(cluster2.info.id, { kubeconfig: cluster2.kubeconfig });
+    providers.set(cluster2.info.id, provider2);
+    return provider2;
+  });
+  return toPromise(provider);
+}
+async function verifyProvider(provider, clusterInfo) {
+  if (!provider) {
+    throw new Error("The provider must be passed to the resource.");
+  }
+  const urn = await toPromise(provider.urn);
+  const [, , , resouceName] = urn.split("::");
+  const expectedId = await toPromise(output(clusterInfo).id);
+  if (resouceName !== expectedId) {
+    throw new Error(
+      "The Kubernetes cluster of the provider is different from the one where the resource is deployed."
+    );
+  }
+}
+function createNamespace(name, provider, args = {}) {
+  return new core.v1.Namespace(
+    name,
+    mergeDeep(args, {
+      metadata: {
+        name
+      }
+    }),
+    { provider }
+  );
+}
+function getNamespace(name = "default", provider) {
+  return core.v1.Namespace.get(name, name, { provider });
+}
+const commonExtraArgs = ["name", "namespace", "metadata"];
+function mapMetadata(args, fallbackName) {
+  return {
+    ...args.metadata,
+    name: args.name ?? args.metadata?.name ?? fallbackName,
+    namespace: args.namespace ? mapNamespaceLikeToNamespaceName(args.namespace) : void 0
+  };
+}
+function mapSelectorLikeToSelector(selector) {
+  if ("matchLabels" in selector || "matchExpressions" in selector) {
+    return selector;
+  }
+  return {
+    matchLabels: selector
+  };
+}
+function mapNamespaceLikeToNamespaceName(namespace) {
+  return core.v1.Namespace.isInstance(namespace) ? namespace.metadata.name : output(namespace);
+}
+function mapNamespaceNameToSelector(namespace) {
+  return {
+    matchLabels: {
+      "kubernetes.io/metadata.name": namespace
+    }
+  };
+}
+function resourceIdToString(metadata) {
+  return output(metadata).apply((metadata2) => {
+    return metadata2.namespace ? `${metadata2.namespace}/${metadata2.name}` : metadata2.name;
+  });
+}
+function getAppName(resourceId) {
+  if (resourceId.namespace !== resourceId.name) {
+    return `${resourceId.namespace ?? "default"}-${resourceId.name}`;
+  }
+  return resourceId.name;
+}
+function getAppDisplayName(resourceId) {
+  if (resourceId.namespace !== resourceId.name) {
+    return `${resourceId.namespace ?? "default"}/${resourceId.name}`;
+  }
+  return resourceId.name;
+}
+
+export { mapSelectorLikeToSelector as a, mapNamespaceNameToSelector as b, commonExtraArgs as c, mapNamespaceLikeToNamespaceName as d, getAppName as e, getProvider as f, getAppDisplayName as g, createNamespace as h, getNamespace as i, mapMetadata as m, resourceIdToString as r, verifyProvider as v };

package/dist/units/cert-manager/index.js

@@ -1,19 +1,37 @@
 import { k8s } from '@highstate/library';
 import { forUnit } from '@highstate/pulumi';
-import { helm } from '@pulumi/kubernetes';
-import { e as createProvider, f as createNamespace, r as resolveChartPath } from '../../shared-hajqPzR4.js';
-import 'node:fs';
-import 'node:path';
+import { f as getProvider, h as createNamespace } from '../../shared-Clzbl5K-.js';
+import { C as Chart } from '../../helm-wPTgVV1N.js';
+import '@pulumi/kubernetes';
 import 'remeda';
+import 'path';
+import 'node:fs/promises';
+import '@pulumi/pulumi';
+import 'nano-spawn';
+import 'crypto-hash';
+import '@pulumi/command';
+import 'glob';
+import 'deepmerge-ts';
+import '@highstate/gateway-api';
+
+var charts = {
+	"cert-manager": {
+	repo: "https://charts.jetstack.io",
+	name: "cert-manager",
+	version: "v1.17.1",
+	sha256: "48707f6e8937290da96065dc7de8b4f5a95d9707798d4b5a0d560f78c12996f7"
+}
+};
 
 const { inputs, outputs } = forUnit(k8s.certManager);
-const provider = await createProvider(inputs.k8sCluster);
+const provider = await getProvider(inputs.k8sCluster);
 const namespace = createNamespace("cert-manager", provider);
-new helm.v4.Chart(
+new Chart(
   "cert-manager",
   {
     namespace: namespace.metadata.name,
-    chart: resolveChartPath("@highstate/k8s", "cert-manager", import.meta.url),
+    cluster: inputs.k8sCluster,
+    chart: charts["cert-manager"],
     values: {
       crds: {
         enabled: true

package/dist/units/dns01-issuer/index.js

@@ -1,10 +1,8 @@
 import { k8s } from '@highstate/library';
 import { toPromise, forUnit, unsecret } from '@highstate/pulumi';
 import { cert_manager } from '@highstate/cert-manager';
-import { e as createProvider } from '../../shared-hajqPzR4.js';
+import { f as getProvider } from '../../shared-Clzbl5K-.js';
 import { capitalize } from 'remeda';
-import 'node:fs';
-import 'node:path';
 import '@pulumi/kubernetes';
 
 async function createDns01Solver(dnsProviderInput, provider) {
@@ -16,7 +14,7 @@ async function createDns01Solver(dnsProviderInput, provider) {
 }
 
 const { name, inputs, outputs } = forUnit(k8s.dns01TlsIssuer);
-const provider = await createProvider(inputs.k8sCluster);
+const provider = await getProvider(inputs.k8sCluster);
 const dns01Solver = await createDns01Solver(inputs.dnsProvider, provider);
 new cert_manager.v1.ClusterIssuer(
   name,
@@ -43,7 +41,7 @@ new cert_manager.v1.ClusterIssuer(
 );
 var index = outputs({
   tlsIssuer: {
-    clusterName: unsecret(inputs.k8sCluster.name),
+    clusterInfo: unsecret(inputs.k8sCluster.info),
     clusterIssuerName: name
   }
 });

package/dist/units/existing-cluster/index.js

@@ -1,15 +1,27 @@
 import { text } from '@highstate/contract';
 import { k8s } from '@highstate/library';
-import { forUnit } from '@highstate/pulumi';
+import { forUnit, toPromise } from '@highstate/pulumi';
+import { Provider, apps, core } from '@pulumi/kubernetes';
 
 const { name, secrets, outputs } = forUnit(k8s.existingCluster);
 const kubeconfig = secrets.kubeconfig.apply(JSON.stringify);
+const provider = new Provider(name, { kubeconfig });
+let cni;
+try {
+  await toPromise(apps.v1.DaemonSet.get("cilium", "kube-system/cilium", { provider }).id);
+  cni = "cilium";
+} catch {
+  console.log("there is no cilium CNI");
+}
+const kubeSystem = core.v1.Namespace.get("kube-system", "kube-system", { provider });
 var index = outputs({
   cluster: {
-    name,
-    kubeconfig,
-    // TODO: detect CNI
-    cni: "unknown"
+    info: {
+      id: kubeSystem.metadata.uid,
+      name,
+      cni
+    },
+    kubeconfig
   },
   $terminals: {
     management: {
@@ -34,6 +46,10 @@ var index = outputs({
         KUBECONFIG: "/kubeconfig"
       }
     }
+  },
+  $status: {
+    clusterId: kubeSystem.metadata.uid,
+    cni: cni ?? "unknown"
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/k8s",
-  "version": "0.6.2",
+  "version": "0.7.1",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,19 +23,23 @@
   },
   "scripts": {
     "build": "pkgroll --tsconfig=tsconfig.build.json",
-    "update-assets": "./scripts/update-assets.sh",
+    "update-charts": "../../scripts/update-charts.sh ./assets/charts.json",
     "generate-crds": "./scripts/generate-crds.sh"
   },
   "dependencies": {
-    "@highstate/cert-manager": "^0.6.2",
-    "@highstate/common": "^0.6.2",
-    "@highstate/contract": "^0.6.2",
-    "@highstate/gateway-api": "^0.6.2",
-    "@highstate/pulumi": "^0.6.2",
+    "@highstate/cert-manager": "^0.7.1",
+    "@highstate/common": "^0.7.1",
+    "@highstate/contract": "^0.7.1",
+    "@highstate/gateway-api": "^0.7.1",
+    "@highstate/pulumi": "^0.7.1",
     "@pulumi/command": "^1.0.2",
     "@pulumi/kubernetes": "^4.18.0",
     "@pulumi/pulumi": "^3.152.0",
+    "crypto-hash": "^3.1.0",
     "deepmerge-ts": "^7.1.5",
+    "glob": "^11.0.1",
+    "nano-spawn": "^0.2.0",
+    "parse-domain": "^8.2.2",
     "remeda": "^2.21.0"
   },
   "peerDependencies": {
@@ -44,5 +48,5 @@
   "devDependencies": {
     "pkgroll": "^2.5.1"
   },
-  "gitHead": "dfd1d6878fc7d12954b6591d5ee1783d3c501eca"
+  "gitHead": "76c38ce5dbf7a710cf0e6339f52e86358537a99a"
 }