@highstate/k8s 0.18.0 → 0.20.0

package/src/cluster.ts

@@ -1,7 +1,7 @@
 import type { k8s, network } from "@highstate/library"
 import { isPrivateAddress, parseAddress } from "@highstate/common"
 import { text, type UnitTerminal } from "@highstate/contract"
-import { fileFromString, type Input, type Output, output } from "@highstate/pulumi"
+import { type Input, makeFileOutput, type Output, output } from "@highstate/pulumi"
 import { CoreV1Api, type KubeConfig } from "@kubernetes/client-node"
 import { images } from "./shared"
 
@@ -54,20 +54,24 @@ export function createK8sTerminal(kubeconfig: Input<string>): Output<UnitTermina
       command: ["bash", "/welcome.sh"],
 
       files: {
-        "/kubeconfig": fileFromString("kubeconfig", kubeconfig, { isSecret: true }),
-
-        "/welcome.sh": fileFromString(
-          "welcome.sh",
-          text`
+        "/kubeconfig": makeFileOutput({
+          name: "kubeconfig",
+          content: kubeconfig,
+          isSecret: true,
+        }),
+
+        "/welcome.sh": makeFileOutput({
+          name: "welcome.sh",
+          content: text`
             echo "Connecting to the cluster..."
             kubectl cluster-info
 
-            echo "Use 'kubectl' and 'helm' to manage the cluster."
+            echo "Use 'kubectl', 'helm' or 'k9s' to manage the cluster."
             echo
 
             exec bash
           `,
-        ),
+        }),
       },
 
       env: {

package/src/config-map.ts

@@ -1,15 +1,16 @@
-import type { k8s } from "@highstate/library"
 import { getOrCreate } from "@highstate/contract"
-import { toPromise } from "@highstate/pulumi"
-import { core, type types } from "@pulumi/kubernetes"
+import { k8s } from "@highstate/library"
 import {
   type ComponentResourceOptions,
   type Input,
   type Inputs,
   interpolate,
+  makeEntityOutput,
   type Output,
   output,
-} from "@pulumi/pulumi"
+  toPromise,
+} from "@highstate/pulumi"
+import { core, type types } from "@pulumi/kubernetes"
 import { Namespace } from "./namespace"
 import { getProvider, mapMetadata, NamespacedResource, type ScopedResourceArgs } from "./shared"
 
@@ -51,7 +52,16 @@ export abstract class ConfigMap extends NamespacedResource {
    * The Highstate config map entity.
    */
   get entity(): Output<k8s.ConfigMap> {
-    return output(this.entityBase)
+    return makeEntityOutput({
+      entity: k8s.configMapEntity,
+      identity: this.metadata.uid,
+      meta: {
+        title: this.metadata.name,
+      },
+      value: {
+        ...this.entityBase,
+      },
+    })
   }
 
   /**

package/src/container.ts

@@ -120,6 +120,8 @@ export type ContainerEnvironmentSource =
   | types.input.core.v1.EnvFromSource
   | core.v1.ConfigMap
   | core.v1.Secret
+  | ConfigMap
+  | Secret
 
 export type ContainerVolumeMount =
   | types.input.core.v1.VolumeMount
@@ -268,7 +270,7 @@ export function mapVolumeMount(volumeMount: ContainerVolumeMount): types.input.c
 export function mapEnvironmentSource(
   envFrom: ContainerEnvironmentSource,
 ): types.input.core.v1.EnvFromSource {
-  if (envFrom instanceof core.v1.ConfigMap) {
+  if (envFrom instanceof core.v1.ConfigMap || envFrom instanceof ConfigMap) {
     return {
       configMapRef: {
         name: envFrom.metadata.name,
@@ -276,7 +278,7 @@ export function mapEnvironmentSource(
     }
   }
 
-  if (envFrom instanceof core.v1.Secret) {
+  if (envFrom instanceof core.v1.Secret || envFrom instanceof Secret) {
     return {
       secretRef: {
         name: envFrom.metadata.name,

package/src/cron-job.ts

@@ -1,13 +1,14 @@
 import type { UnitTerminal } from "@highstate/contract"
-import type { k8s } from "@highstate/library"
 import type { Container } from "./container"
 import type { NetworkPolicy } from "./network-policy"
 import { getOrCreate } from "@highstate/contract"
+import { k8s } from "@highstate/library"
 import {
   type ComponentResourceOptions,
   type Input,
   type Inputs,
   interpolate,
+  makeEntityOutput,
   type Output,
   output,
   toPromise,
@@ -19,6 +20,7 @@ import { omit } from "remeda"
 import { Namespace } from "./namespace"
 import { commonExtraArgs, getProvider, mapMetadata, type ScopedResourceArgs } from "./shared"
 import {
+  filterPatchOwnedContainersInTemplate,
   getWorkloadComponents,
   Workload,
   type WorkloadArgs,
@@ -96,7 +98,17 @@ export abstract class CronJob extends Workload {
    * The Highstate cron job entity.
    */
   get entity(): Output<k8s.CronJob> {
-    return output(this.entityBase)
+    return makeEntityOutput({
+      entity: k8s.cronJobEntity,
+      identity: this.metadata.uid,
+      meta: {
+        title: this.metadata.name,
+      },
+      value: {
+        ...this.entityBase,
+        spec: this.spec.jobTemplate.spec,
+      },
+    })
   }
 
   protected getTerminalMeta(): Output<UnitTerminal["meta"]> {
@@ -313,7 +325,7 @@ class CronJobPatch extends CronJob {
         {
           metadata: mapMetadata(args, name),
           spec: output({ args, podTemplate }).apply(({ args, podTemplate }) => {
-            return deepmerge(
+            const spec = deepmerge(
               {
                 jobTemplate: {
                   spec: {
@@ -323,7 +335,16 @@ class CronJobPatch extends CronJob {
                 schedule: args.schedule!,
               } satisfies types.input.batch.v1.CronJobSpec,
               omit(args, cronJobExtraArgs) as types.input.batch.v1.CronJobSpec,
-            )
+            ) as Unwrap<types.input.batch.v1.CronJobSpec>
+
+            if (spec.jobTemplate?.spec?.template) {
+              spec.jobTemplate.spec.template = filterPatchOwnedContainersInTemplate(
+                spec.jobTemplate.spec.template,
+                podTemplate,
+              )
+            }
+
+            return spec
           }),
         },
         {

package/src/deployment.ts

@@ -1,14 +1,15 @@
 import type { AccessPointRoute } from "@highstate/common"
-import type { k8s } from "@highstate/library"
 import type { Container } from "./container"
 import type { NetworkPolicy } from "./network-policy"
 import type { Service } from "./service"
 import { getOrCreate, type UnitTerminal } from "@highstate/contract"
+import { k8s } from "@highstate/library"
 import {
   type ComponentResourceOptions,
   type Input,
   type Inputs,
   interpolate,
+  makeEntityOutput,
   type Output,
   output,
   toPromise,
@@ -20,14 +21,15 @@ import { omit } from "remeda"
 import { Namespace } from "./namespace"
 import { getProvider, mapMetadata } from "./shared"
 import {
-  ExposableWorkload,
-  type ExposableWorkloadArgs,
-  exposableWorkloadExtraArgs,
-  getExposableWorkloadComponents,
+  filterPatchOwnedContainersInTemplate,
+  getWorkloadServiceComponents,
+  Workload,
+  type WorkloadServiceArgs,
   type WorkloadTerminalArgs,
+  workloadServiceExtraArgs,
 } from "./workload"
 
-export type DeploymentArgs = Omit<ExposableWorkloadArgs, "existing"> &
+export type DeploymentArgs = Omit<WorkloadServiceArgs, "existing"> &
   Omit<Partial<types.input.apps.v1.DeploymentSpec>, "template"> & {
     template?: {
       metadata?: types.input.meta.v1.ObjectMeta
@@ -42,7 +44,7 @@ export type CreateOrGetDeploymentArgs = DeploymentArgs & {
   existing: Input<k8s.Deployment> | undefined
 }
 
-export abstract class Deployment extends ExposableWorkload {
+export abstract class Deployment extends Workload {
   static readonly apiVersion = "apps/v1"
   static readonly kind = "Deployment"
 
@@ -107,10 +109,17 @@ export abstract class Deployment extends ExposableWorkload {
   get entity(): Output<k8s.Deployment> {
     const service = this._service.apply(service => service?.entity)
 
-    return output({
-      ...this.entityBase,
-      service,
-      endpoints: service.apply(svc => output(svc?.endpoints ?? [])),
+    return makeEntityOutput({
+      entity: k8s.deploymentEntity,
+      identity: this.metadata.uid,
+      meta: {
+        title: this.metadata.name,
+      },
+      value: {
+        ...this.entityBase,
+        service,
+        spec: this.spec,
+      },
     })
   }
 
@@ -249,7 +258,7 @@ export abstract class Deployment extends ExposableWorkload {
 class CreatedDeployment extends Deployment {
   constructor(name: string, args: DeploymentArgs, opts?: ComponentResourceOptions) {
     const { labels, podTemplate, networkPolicy, containers, service, routes } =
-      getExposableWorkloadComponents(name, args, () => this, opts)
+      getWorkloadServiceComponents(name, args, () => this, opts)
 
     const deployment = output(args.namespace).cluster.apply(cluster => {
       return new apps.v1.Deployment(
@@ -262,7 +271,7 @@ class CreatedDeployment extends Deployment {
                 template: podTemplate,
                 selector: { matchLabels: labels },
               },
-              omit(args, exposableWorkloadExtraArgs),
+              omit(args, workloadServiceExtraArgs),
             ) as types.input.apps.v1.DeploymentSpec
           }),
         },
@@ -295,7 +304,7 @@ class CreatedDeployment extends Deployment {
 class DeploymentPatch extends Deployment {
   constructor(name: string, args: DeploymentArgs, opts?: ComponentResourceOptions) {
     const { podTemplate, networkPolicy, containers, service, routes } =
-      getExposableWorkloadComponents(name, args, () => this, opts, true)
+      getWorkloadServiceComponents(name, args, () => this, opts, true)
 
     const deployment = output(args.namespace).cluster.apply(cluster => {
       return new apps.v1.DeploymentPatch(
@@ -303,10 +312,16 @@ class DeploymentPatch extends Deployment {
         {
           metadata: mapMetadata(args, name),
           spec: output({ args, podTemplate }).apply(({ args, podTemplate }) => {
-            return deepmerge(
+            const spec = deepmerge(
               { template: podTemplate },
-              omit(args, exposableWorkloadExtraArgs),
-            ) as types.input.apps.v1.DeploymentSpec
+              omit(args, workloadServiceExtraArgs),
+            ) as Unwrap<types.input.apps.v1.DeploymentSpec>
+
+            if (spec.template) {
+              spec.template = filterPatchOwnedContainersInTemplate(spec.template, podTemplate)
+            }
+
+            return spec
           }),
         },
         {

package/src/gateway/backend.ts

@@ -24,12 +24,12 @@ export interface ServiceBackendRef {
   /**
    * The name of the service being referenced.
    */
-  service: Input<core.v1.Service>
+  service: Input<core.v1.Service | Service>
 
   /**
    * The port of the service being referenced.
    */
-  port: Input<number>
+  port?: Input<number>
 }
 
 export type BackendRef = FullBackendRef | ServiceBackendRef | Service
@@ -49,7 +49,7 @@ export function resolveBackendRef(ref: BackendRef): Output<Unwrap<FullBackendRef
     return output({
       name: service.metadata.name,
       namespace: service.metadata.namespace,
-      port: ref.port,
+      port: ref.port ?? service.spec.ports[0].port,
     })
   }
 

package/src/gateway/gateway.ts

@@ -1,15 +1,15 @@
-import type { k8s, network } from "@highstate/library"
 import type { types } from "@pulumi/kubernetes"
-import type { SetRequired } from "type-fest"
 import { parseEndpoint } from "@highstate/common"
 import { getOrCreate } from "@highstate/contract"
 import { gateway, type types as gwTypes } from "@highstate/gateway-api"
+import { k8s, type network } from "@highstate/library"
 import {
   type ComponentResourceOptions,
   type Input,
   type InputArray,
   type Inputs,
   interpolate,
+  makeEntityOutput,
   type Output,
   output,
   toPromise,
@@ -81,7 +81,16 @@ export abstract class Gateway extends NamespacedResource {
    * The Highstate gateway entity.
    */
   get entity(): Output<k8s.Gateway> {
-    return output(this.entityBase)
+    return makeEntityOutput({
+      entity: k8s.gatewayEntity,
+      identity: this.metadata.uid,
+      meta: {
+        title: this.metadata.name,
+      },
+      value: {
+        ...this.entityBase,
+      },
+    })
   }
 
   /**
@@ -217,59 +226,6 @@ export abstract class Gateway extends NamespacedResource {
 
     return Gateway.for(resolvedEntity, output(cluster))
   }
-
-  /**
-   * Creates a gateway with the provided name/namespace/cluster only once.
-   *
-   * It automatically names the resource with the following format: `{name}.{namespace}.{clusterName}.{clusterId}`.
-   *
-   * On subsequent calls the gateway is patched with the union of existing and requested listeners.
-   * Only the listeners field is modified to avoid altering other spec fields.
-   *
-   * @param name The name of the gateway to create.
-   * @param args The arguments to create the gateway with.
-   * @param opts Optional resource options.
-   */
-  static async createOnce(
-    args: SetRequired<GatewayArgs, "name">,
-    opts?: ComponentResourceOptions,
-  ): Promise<Gateway> {
-    const { name, namespace, cluster } = await toPromise({
-      name: args.name,
-      namespace: output(args.namespace).metadata.name,
-      cluster: output(args.namespace).cluster,
-    })
-
-    const fullName = `${name}.${namespace}.${cluster.name}.${cluster.id}`
-
-    const existing = Gateway.gatewayCache.get(fullName)
-    if (existing) {
-      Gateway.patch(
-        fullName,
-        {
-          name,
-          namespace: args.namespace,
-          listeners: args.listeners,
-        },
-        opts,
-      )
-
-      return existing
-    }
-
-    const created = Gateway.create(
-      fullName,
-      {
-        ...args,
-        name,
-        namespace: args.namespace,
-      },
-      opts,
-    )
-
-    Gateway.gatewayCache.set(fullName, created)
-    return created
-  }
 }
 
 class CreatedGateway extends Gateway {