@highstate/k8s 0.14.2 → 0.16.0

package/dist/{chunk-YTRQ6JRU.js → chunk-XRIC6EJ3.js}

@@ -1,30 +1,27 @@
-import { isEndpointFromCluster, mapServiceToLabelSelector, Service, mapContainerPortToServicePort } from './chunk-3CKMDTYK.js';
-import { Secret } from './chunk-VJL2BFKO.js';
-import { commonExtraArgs, ScopedResource, Namespace, mapMetadata, getProvider, mapSelectorLikeToSelector, getProviderAsync, mapNamespaceNameToSelector, getNamespaceName, images_exports } from './chunk-SEWB4FUB.js';
+import { isEndpointFromCluster, mapServiceToLabelSelector, Service, mapContainerPortToServicePort } from './chunk-TWBMG6TD.js';
+import { Secret } from './chunk-4G6LLC2X.js';
+import { commonExtraArgs, NamespacedResource, Namespace, mapMetadata, getProvider, mapSelectorLikeToSelector, getProviderAsync, mapNamespaceNameToSelector, getNamespaceName, images_exports } from './chunk-OBDQONMV.js';
 import { z, getOrCreate, trimIndentation } from '@highstate/contract';
 import { ComponentResource, toPromise, output as output$1, interpolate as interpolate$1, normalize, normalizeInputs, fileFromString } from '@highstate/pulumi';
 import { core, networking } from '@pulumi/kubernetes';
 import { output, interpolate } from '@pulumi/pulumi';
 import { deepmerge } from 'deepmerge-ts';
-import { omit, concat, map, groupBy, mergeDeep, uniqueBy, flat, merge, filter, isNonNullish, unique } from 'remeda';
-import { ImplementationMediator, filterEndpoints, parseL34Endpoint, l34EndpointToString, l3EndpointToCidr, AccessPointRoute } from '@highstate/common';
+import { omit, concat, map, groupBy, isNonNullish, mergeDeep, uniqueBy, flat, merge, filter, unique } from 'remeda';
+import { ImplementationMediator, parseEndpoint, addressToCidr, endpointToString, l3EndpointToCidr, AccessPointRoute, mergeEndpoints } from '@highstate/common';
 import { sha256 } from 'crypto-hash';
 
-var ConfigMap = class _ConfigMap extends ScopedResource {
-  constructor(type, name, args, opts, apiVersion, kind, namespace, metadata, data) {
-    super(type, name, args, opts, apiVersion, kind, namespace, metadata);
+var ConfigMap = class _ConfigMap extends NamespacedResource {
+  constructor(type, name, args, opts, metadata, namespace, data) {
+    super(type, name, args, opts, metadata, namespace);
     this.data = data;
   }
+  static apiVersion = "v1";
+  static kind = "ConfigMap";
   /**
    * The Highstate config map entity.
    */
   get entity() {
-    return output({
-      type: "config-map",
-      clusterId: this.cluster.id,
-      clusterName: this.cluster.name,
-      metadata: this.metadata
-    });
+    return output(this.entityBase);
   }
   /**
    * Creates a new config map.
@@ -148,10 +145,8 @@ var CreatedConfigMap = class extends ConfigMap {
       name,
       args,
       opts,
-      configMap.apiVersion,
-      configMap.kind,
-      output(args.namespace),
       configMap.metadata,
+      output(args.namespace),
       configMap.data
     );
   }
@@ -177,10 +172,8 @@ var ConfigMapPatch = class extends ConfigMap {
       name,
       args,
       opts,
-      configMap.apiVersion,
-      configMap.kind,
-      output(args.namespace),
       configMap.metadata,
+      output(args.namespace),
       configMap.data
     );
   }
@@ -192,10 +185,8 @@ var WrappedConfigMap = class extends ConfigMap {
       name,
       args,
       opts,
-      output(args.configMap).apiVersion,
-      output(args.configMap).kind,
-      output(args.namespace),
       output(args.configMap).metadata,
+      output(args.namespace),
       output(args.configMap).data
     );
   }
@@ -214,31 +205,26 @@ var ExternalConfigMap = class extends ConfigMap {
       name,
       args,
       opts,
-      configMap.apiVersion,
-      configMap.kind,
-      output(args.namespace),
       configMap.metadata,
+      output(args.namespace),
       configMap.data
     );
   }
 };
 var extraPersistentVolumeClaimArgs = [...commonExtraArgs, "size"];
-var PersistentVolumeClaim = class _PersistentVolumeClaim extends ScopedResource {
-  constructor(type, name, args, opts, apiVersion, kind, namespace, metadata, spec, status) {
-    super(type, name, args, opts, apiVersion, kind, namespace, metadata);
+var PersistentVolumeClaim = class _PersistentVolumeClaim extends NamespacedResource {
+  constructor(type, name, args, opts, metadata, namespace, spec, status) {
+    super(type, name, args, opts, metadata, namespace);
     this.spec = spec;
     this.status = status;
   }
+  static apiVersion = "v1";
+  static kind = "PersistentVolumeClaim";
   /**
    * The Highstate PVC entity.
    */
   get entity() {
-    return output$1({
-      type: "persistent-volume-claim",
-      clusterId: this.cluster.id,
-      clusterName: this.cluster.name,
-      metadata: this.metadata
-    });
+    return output$1(this.entityBase);
   }
   /**
    * Creates a new PVC.
@@ -374,10 +360,8 @@ var CreatedPersistentVolumeClaim = class extends PersistentVolumeClaim {
       name,
       args,
       opts,
-      pvc.apiVersion,
-      pvc.kind,
-      output$1(args.namespace),
       pvc.metadata,
+      output$1(args.namespace),
       pvc.spec,
       pvc.status
     );
@@ -416,10 +400,8 @@ var PersistentVolumeClaimPatch = class extends PersistentVolumeClaim {
       name,
       args,
       opts,
-      pvc.apiVersion,
-      pvc.kind,
-      output$1(args.namespace),
       pvc.metadata,
+      output$1(args.namespace),
       pvc.spec,
       pvc.status
     );
@@ -432,10 +414,8 @@ var WrappedPersistentVolumeClaim = class extends PersistentVolumeClaim {
       name,
       args,
       opts,
-      output$1(args.pvc).apiVersion,
-      output$1(args.pvc).kind,
-      output$1(args.namespace),
       output$1(args.pvc).metadata,
+      output$1(args.namespace),
       output$1(args.pvc).spec,
       output$1(args.pvc).status
     );
@@ -455,10 +435,8 @@ var ExternalPersistentVolumeClaim = class extends PersistentVolumeClaim {
       name,
       args,
       opts,
-      pvc.apiVersion,
-      pvc.kind,
-      output$1(args.namespace),
       pvc.metadata,
+      output$1(args.namespace),
       pvc.spec,
       pvc.status
     );
@@ -664,6 +642,8 @@ function getWorkloadVolumeResourceUuid(volume) {
   }
   return output$1(void 0);
 }
+
+// src/network.ts
 function getBestEndpoint(endpoints, cluster) {
   if (!endpoints.length) {
     return void 0;
@@ -671,14 +651,19 @@ function getBestEndpoint(endpoints, cluster) {
   if (endpoints.length === 1) {
     return endpoints[0];
   }
-  if (!cluster) {
-    return filterEndpoints(endpoints)[0];
+  if (cluster) {
+    const clusterEndpoint = endpoints.find(
+      (endpoint) => isEndpointFromCluster(endpoint, cluster) && endpoint.metadata["k8s.service"].isInternal
+    );
+    if (clusterEndpoint) {
+      return clusterEndpoint;
+    }
   }
-  const clusterEndpoint = endpoints.find((endpoint) => isEndpointFromCluster(endpoint, cluster));
-  if (clusterEndpoint) {
-    return clusterEndpoint;
+  const publicEndpoint = endpoints.find((endpoint) => endpoint.metadata["iana.scope"] === "global");
+  if (publicEndpoint) {
+    return publicEndpoint;
   }
-  return filterEndpoints(endpoints)[0];
+  return endpoints[0];
 }
 function requireBestEndpoint(endpoints, cluster) {
   const endpoint = getBestEndpoint(endpoints, cluster);
@@ -724,7 +709,7 @@ var NetworkPolicy = class _NetworkPolicy extends ComponentResource {
         allowKubeApiServer: args2.allowKubeApiServer ?? false,
         ingressRules: ingressRules.flatMap((rule) => {
           const endpoints = normalize(rule?.fromEndpoint, rule?.fromEndpoints);
-          const parsedEndpoints = endpoints.map(parseL34Endpoint);
+          const parsedEndpoints = endpoints.map((endpoint) => parseEndpoint(endpoint));
           const endpointsNamespaces = groupBy(parsedEndpoints, (endpoint) => {
             const namespace = isEndpointFromCluster(endpoint, cluster) ? endpoint.metadata["k8s.service"].namespace : "";
             return namespace;
@@ -748,10 +733,10 @@ var NetworkPolicy = class _NetworkPolicy extends ComponentResource {
         }),
         egressRules: egressRules.flatMap((rule) => {
           const endpoints = normalize(rule?.toEndpoint, rule?.toEndpoints);
-          const parsedEndpoints = endpoints.map(parseL34Endpoint);
+          const parsedEndpoints = endpoints.map((endpoint) => parseEndpoint(endpoint));
           const endpointsByPortsAnsNamespaces = groupBy(parsedEndpoints, (endpoint) => {
             const namespace = isEndpointFromCluster(endpoint, cluster) ? endpoint.metadata["k8s.service"].namespace : "";
-            const port = isEndpointFromCluster(endpoint, cluster) ? endpoint.metadata["k8s.service"].targetPort : endpoint.port;
+            const port = isEndpointFromCluster(endpoint, cluster) ? endpoint.metadata["k8s.service"].targetPort : endpoint.level !== 3 ? endpoint.port : void 0;
             return `${port ?? "0"}:${namespace}`;
           });
           const l3OnlyRule = endpointsByPortsAnsNamespaces["0:"] ? _NetworkPolicy.getRuleFromEndpoint(
@@ -798,15 +783,14 @@ var NetworkPolicy = class _NetworkPolicy extends ComponentResource {
       })
     );
   }
-  static mapCidrFromEndpoint(result) {
-    if (result.type === "ipv4") {
-      return `${result.address}/32`;
-    }
-    return `${result.address}/128`;
-  }
   static getRuleFromEndpoint(port, endpoints, cluster) {
-    const ports = port ? [{ port, protocol: endpoints[0].protocol?.toUpperCase() }] : [];
-    const cidrs = endpoints.filter((endpoint) => !isEndpointFromCluster(endpoint, cluster)).filter((endpoint) => endpoint.type === "ipv4" || endpoint.type === "ipv6").map(_NetworkPolicy.mapCidrFromEndpoint);
+    const ports = port ? [
+      {
+        port,
+        protocol: endpoints[0].level !== 3 ? endpoints[0].protocol?.toUpperCase() : void 0
+      }
+    ] : [];
+    const cidrs = endpoints.filter((endpoint) => !isEndpointFromCluster(endpoint, cluster)).map((endpoint) => endpoint.address ? addressToCidr(endpoint.address) : null).filter(isNonNullish);
     const fqdns = endpoints.filter((endpoint) => endpoint.type === "hostname").map((endpoint) => endpoint.hostname);
     const selectors = endpoints.filter((endpoint) => isEndpointFromCluster(endpoint, cluster)).map((endpoint) => endpoint.metadata["k8s.service"].selector);
     const namespace = endpoints.filter((endpoint) => isEndpointFromCluster(endpoint, cluster)).map((endpoint) => endpoint.metadata["k8s.service"].namespace)[0];
@@ -961,15 +945,15 @@ var NetworkPolicy = class _NetworkPolicy extends ComponentResource {
    * @param opts Optional resource options.
    */
   static async allowEgressToEndpoint(namespace, endpoint, opts) {
-    const parsedEndpoint = parseL34Endpoint(endpoint);
-    const endpointStr = l34EndpointToString(parsedEndpoint).replace(/:/g, "-");
+    const parsedEndpoint = parseEndpoint(endpoint);
+    const endpointStr = endpointToString(parsedEndpoint).replace(/:/g, "-");
     const nsName = await toPromise(output$1(namespace).metadata.name);
     const cluster = await toPromise(output$1(namespace).cluster);
     return new _NetworkPolicy(
       `allow-egress-to-${endpointStr}.${cluster.name}.${nsName}.${cluster.id}`,
       {
         namespace,
-        description: `Allow egress traffic to "${l34EndpointToString(parsedEndpoint)}" from the namespace.`,
+        description: `Allow egress traffic to "${endpointToString(parsedEndpoint)}" from the namespace.`,
         egressRule: { toEndpoint: endpoint }
       },
       opts
@@ -987,7 +971,10 @@ var NetworkPolicy = class _NetworkPolicy extends ComponentResource {
   static async allowEgressToBestEndpoint(namespace, endpoints, opts) {
     const cluster = await toPromise(output$1(namespace).cluster);
     const resolvedEndpoints = await toPromise(output$1(endpoints));
-    const bestEndpoint = requireBestEndpoint(resolvedEndpoints.map(parseL34Endpoint), cluster);
+    const bestEndpoint = requireBestEndpoint(
+      resolvedEndpoints.map((endpoint) => parseEndpoint(endpoint)),
+      cluster
+    );
     return await _NetworkPolicy.allowEgressToEndpoint(namespace, bestEndpoint, opts);
   }
   /**
@@ -1000,15 +987,15 @@ var NetworkPolicy = class _NetworkPolicy extends ComponentResource {
    * @param opts Optional resource options.
    */
   static async allowIngressFromEndpoint(namespace, endpoint, opts) {
-    const parsedEndpoint = parseL34Endpoint(endpoint);
-    const endpointStr = l34EndpointToString(parsedEndpoint).replace(/:/g, "-");
+    const parsedEndpoint = parseEndpoint(endpoint);
+    const endpointStr = endpointToString(parsedEndpoint).replace(/:/g, "-");
     const nsName = await toPromise(output$1(namespace).metadata.name);
     const cluster = await toPromise(output$1(namespace).cluster);
     return new _NetworkPolicy(
       `allow-ingress-from-${endpointStr}.${cluster.name}.${nsName}.${cluster.id}`,
       {
         namespace,
-        description: interpolate$1`Allow ingress traffic from "${l34EndpointToString(parsedEndpoint)}" to the namespace.`,
+        description: interpolate$1`Allow ingress traffic from "${endpointToString(parsedEndpoint)}" to the namespace.`,
         ingressRule: { fromEndpoint: endpoint }
       },
       opts
@@ -1323,9 +1310,9 @@ function getExposableWorkloadComponents(name, args, parent, opts, isForPatch) {
   });
   return { labels, containers, volumes, podSpec, podTemplate, networkPolicy, service, routes };
 }
-var Workload = class extends ScopedResource {
-  constructor(type, name, args, opts, apiVersion, kind, terminalArgs, containers, namespace, metadata, podTemplate, networkPolicy) {
-    super(type, name, args, opts, apiVersion, kind, namespace, metadata);
+var Workload = class extends NamespacedResource {
+  constructor(type, name, args, opts, metadata, namespace, terminalArgs, containers, podTemplate, networkPolicy) {
+    super(type, name, args, opts, metadata, namespace);
     this.name = name;
     this.terminalArgs = terminalArgs;
     this.containers = containers;
@@ -1336,7 +1323,7 @@ var Workload = class extends ScopedResource {
   set terminal(_value) {
   }
   /**
-   * The instance terminal to interact with the deployment.
+   * The instance terminal to interact with the workload's pods.
    */
   get terminal() {
     const containerName = this.podTemplate.spec.containers.apply((containers) => containers[0].name);
@@ -1359,7 +1346,7 @@ var Workload = class extends ScopedResource {
               set -euo pipefail
 
               NAMESPACE="${this.metadata.namespace}"
-              RESOURCE_TYPE="${this.kind.apply((k) => k.toLowerCase())}"
+              RESOURCE_TYPE="${this.kind.toLowerCase()}"
               RESOURCE_NAME="${this.metadata.name}"
               CONTAINER_NAME="${containerName}"
               SHELL="${shell}"
@@ -1433,7 +1420,7 @@ var Workload = class extends ScopedResource {
           "-it",
           "-n",
           this.metadata.namespace,
-          interpolate`${this.kind.apply((k) => k.toLowerCase())}/${this.metadata.name}`,
+          `${this.kind.toLowerCase()}/${this.metadata.name}`,
           "-c",
           containerName,
           "--",
@@ -1450,20 +1437,90 @@ var Workload = class extends ScopedResource {
       }
     });
   }
+  /**
+   * Creates a generic workload or patches the existing one.
+   */
+  static createOrPatchGeneric(name, args, opts) {
+    return output(args).apply(async (args2) => {
+      if (args2.existing?.kind === "Deployment") {
+        const { Deployment } = await import('./deployment-HRJGAEJR.js');
+        return Deployment.patch(
+          name,
+          {
+            ...deepmerge(args2, args2.deployment),
+            name: args2.existing.metadata.name,
+            namespace: Namespace.forResourceAsync(args2.existing, output(args2.namespace).cluster)
+          },
+          opts
+        );
+      }
+      if (args2.existing?.kind === "StatefulSet") {
+        const { StatefulSet } = await import('./stateful-set-LAJR5RL4.js');
+        return StatefulSet.patch(
+          name,
+          {
+            ...deepmerge(args2, args2.statefulSet),
+            name: args2.existing.metadata.name,
+            namespace: Namespace.forResourceAsync(args2.existing, output(args2.namespace).cluster)
+          },
+          opts
+        );
+      }
+      if (args2.existing?.kind === "Job") {
+        const { Job } = await import('./job-J4BKBVQD.js');
+        return Job.patch(
+          name,
+          {
+            ...deepmerge(args2, args2.job),
+            name: args2.existing.metadata.name,
+            namespace: Namespace.forResourceAsync(args2.existing, output(args2.namespace).cluster)
+          },
+          opts
+        );
+      }
+      if (args2.existing?.kind === "CronJob") {
+        const { CronJob } = await import('./cron-job-LX35I6HG.js');
+        return CronJob.patch(
+          name,
+          {
+            ...deepmerge(args2, args2.cronJob),
+            name: args2.existing.metadata.name,
+            namespace: Namespace.forResourceAsync(args2.existing, output(args2.namespace).cluster)
+          },
+          opts
+        );
+      }
+      if (args2.defaultType === "Deployment") {
+        const { Deployment } = await import('./deployment-HRJGAEJR.js');
+        return Deployment.create(name, deepmerge(args2, args2.deployment), opts);
+      }
+      if (args2.defaultType === "StatefulSet") {
+        const { StatefulSet } = await import('./stateful-set-LAJR5RL4.js');
+        return StatefulSet.create(name, deepmerge(args2, args2.statefulSet), opts);
+      }
+      if (args2.defaultType === "Job") {
+        const { Job } = await import('./job-J4BKBVQD.js');
+        return Job.create(name, deepmerge(args2, args2.job), opts);
+      }
+      if (args2.defaultType === "CronJob") {
+        const { CronJob } = await import('./cron-job-LX35I6HG.js');
+        return CronJob.create(name, deepmerge(args2, args2.cronJob), opts);
+      }
+      throw new Error(`Unknown workload type: ${args2.defaultType}`);
+    });
+  }
 };
 var ExposableWorkload = class extends Workload {
-  constructor(type, name, args, opts, apiVersion, kind, terminalArgs, containers, namespace, metadata, podTemplate, networkPolicy, _service, routes) {
+  constructor(type, name, args, opts, metadata, namespace, terminalArgs, containers, podTemplate, networkPolicy, _service, routes) {
     super(
       type,
       name,
       args,
       opts,
-      apiVersion,
-      kind,
+      metadata,
+      namespace,
       terminalArgs,
       containers,
-      namespace,
-      metadata,
       podTemplate,
       networkPolicy
     );
@@ -1496,12 +1553,20 @@ var ExposableWorkload = class extends Workload {
     });
   }
   /**
-   * Creates a generic workload or patches the existing one.
+   * The merged and deduplicated L3 endpoints of all routes.
+   */
+  get endpoints() {
+    return this.routes.apply(
+      (routes) => output(routes.map((route) => route.route.endpoints)).apply((endpoints) => flat(endpoints)).apply(mergeEndpoints)
+    );
+  }
+  /**
+   * Creates a generic exposable workload or patches the existing one.
    */
   static createOrPatchGeneric(name, args, opts) {
     return output(args).apply(async (args2) => {
-      if (args2.existing?.type === "deployment") {
-        const { Deployment } = await import('./deployment-THUD5QUH.js');
+      if (args2.existing?.kind === "Deployment") {
+        const { Deployment } = await import('./deployment-HRJGAEJR.js');
         return Deployment.patch(
           name,
           {
@@ -1512,8 +1577,8 @@ var ExposableWorkload = class extends Workload {
           opts
         );
       }
-      if (args2.existing?.type === "stateful-set") {
-        const { StatefulSet } = await import('./stateful-set-ABCZML4L.js');
+      if (args2.existing?.kind === "StatefulSet") {
+        const { StatefulSet } = await import('./stateful-set-LAJR5RL4.js');
         return StatefulSet.patch(
           name,
           {
@@ -1524,19 +1589,19 @@ var ExposableWorkload = class extends Workload {
           opts
         );
       }
-      if (args2.type === "Deployment") {
-        const { Deployment } = await import('./deployment-THUD5QUH.js');
+      if (args2.defaultType === "Deployment") {
+        const { Deployment } = await import('./deployment-HRJGAEJR.js');
         return Deployment.create(name, deepmerge(args2, args2.deployment), opts);
       }
-      if (args2.type === "StatefulSet") {
-        const { StatefulSet } = await import('./stateful-set-ABCZML4L.js');
+      if (args2.defaultType === "StatefulSet") {
+        const { StatefulSet } = await import('./stateful-set-LAJR5RL4.js');
         return StatefulSet.create(name, deepmerge(args2, args2.statefulSet), opts);
       }
-      throw new Error(`Unknown workload type: ${args2.type}`);
+      throw new Error(`Unknown workload type: ${args2.defaultType}`);
     });
   }
 };
 
 export { ConfigMap, ExposableWorkload, NativeNetworkPolicy, NetworkPolicy, PersistentVolumeClaim, Workload, exposableWorkloadExtraArgs, getAutoVolumeName, getBestEndpoint, getExposableWorkloadComponents, getFallbackContainerName, getWorkloadComponents, getWorkloadVolumeResourceUuid, mapContainerEnvironment, mapContainerToRaw, mapEnvironmentSource, mapVolumeMount, mapWorkloadVolume, networkPolicyMediator, podSpecDefaults, requireBestEndpoint, workloadExtraArgs };
-//# sourceMappingURL=chunk-YTRQ6JRU.js.map
-//# sourceMappingURL=chunk-YTRQ6JRU.js.map
+//# sourceMappingURL=chunk-XRIC6EJ3.js.map
+//# sourceMappingURL=chunk-XRIC6EJ3.js.map