@intentius/chant-lexicon-k8s 0.5.0 → 0.6.0

package/dist/integrity.json

@@ -1,9 +1,9 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "9374641f828a73946b94c618f4506db09e0572e37c80687d27ec1bd087d46c5b",
-    "meta.json": "8e9c0279eb8666c8b181897a55f614c7e803fed6fc6cb549249d8f998aa764d2",
-    "types/index.d.ts": "7eb3017762f49faa57dae1d71f3e77a08e52ac8fc7eeab192cba4e981b7efed6",
+    "manifest.json": "325a1a5cc4b768c462b6aeee499bf24167cae69efb726d337dcef1e9d62ec48e",
+    "meta.json": "4177925d0043a2879c34e1e871e9ca8f33093999d08fa5fc411ee11086381529",
+    "types/index.d.ts": "bf626b2c92e3375a7d93b2c96a8a95a992507a679707b47a35cf6501f32a70bf",
     "rules/argo-appset-single-project.ts": "afa9f310753aa2d475f35012b13135b2dfaebed2a35d44edbe185ebc07673674",
     "rules/argo-ast.ts": "f57b7d84fef9c9cd326a7cad0dff290914e01299415d64bdab48e2f6eb4181c3",
     "rules/argo-automated-prune.ts": "176ac5441c3ccb7106a194abab3abe22fd8a29f976716761c66c243b72d57b14",
@@ -50,5 +50,5 @@
     "skills/chant-k8s-aks.md": "e18f0e2b055f72cd7a37deaf258d7027c2d4d3e286e8fd4975b27a1f981a3ad9",
     "skills/chant-k8s-argo.md": "b1a0b826559d8c5033a479c5781efaf650320f0aee4419d8841170bd3393cea5"
   },
-  "composite": "180d3f080502a920514bd5170f6e05173aeb9a02475271731b3caa2373a34539"
+  "composite": "0a3f2c077188f2174f9670dfe944d80d133e7abed5eace1e06b5996b1335fa92"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "k8s",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "chantVersion": ">=0.1.0",
   "namespace": "K8s",
   "intrinsics": [],

package/dist/meta.json

@@ -187,6 +187,11 @@
     "kind": "property",
     "lexicon": "k8s"
   },
+  "AttachMetadata": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.attachMetadata",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "AutoscalerOptions": {
     "resourceType": "K8s::Ray::RayCluster.autoscalerOptions",
     "kind": "property",
@@ -655,6 +660,11 @@
     "apiVersion": "resource.k8s.io/v1beta1",
     "gvkKind": "DeviceClassList"
   },
+  "Endpoint": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.endpoints",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "EndpointSlice": {
     "resourceType": "K8s::Discovery::EndpointSlice",
     "kind": "resource",
@@ -826,6 +836,11 @@
     "kind": "property",
     "lexicon": "k8s"
   },
+  "Group": {
+    "resourceType": "K8s::Monitoring::PrometheusRule.groups",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "HPA": {
     "resourceType": "K8s::Autoscaling::HorizontalPodAutoscaler",
     "kind": "resource",
@@ -1154,6 +1169,11 @@
     "kind": "property",
     "lexicon": "k8s"
   },
+  "NamespaceSelector": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.namespaceSelector",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "NetPol": {
     "resourceType": "K8s::Networking::NetworkPolicy",
     "kind": "resource",
@@ -1475,6 +1495,18 @@
       }
     }
   },
+  "PrometheusRule": {
+    "resourceType": "K8s::Monitoring::PrometheusRule",
+    "kind": "resource",
+    "lexicon": "k8s",
+    "apiVersion": "monitoring.coreos.com/v1",
+    "gvkKind": "PrometheusRule"
+  },
+  "PrometheusRule_Group": {
+    "resourceType": "K8s::Monitoring::PrometheusRule.groups",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "RayCluster": {
     "resourceType": "K8s::Ray::RayCluster",
     "kind": "resource",
@@ -1784,6 +1816,11 @@
       }
     }
   },
+  "Selector": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.selector",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "SelfSubjectAccessReview": {
     "resourceType": "K8s::Authorization::SelfSubjectAccessReview",
     "kind": "resource",
@@ -1862,6 +1899,33 @@
     "apiVersion": "v1",
     "gvkKind": "ServiceList"
   },
+  "ServiceMonitor": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor",
+    "kind": "resource",
+    "lexicon": "k8s",
+    "apiVersion": "monitoring.coreos.com/v1",
+    "gvkKind": "ServiceMonitor"
+  },
+  "ServiceMonitor_AttachMetadata": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.attachMetadata",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
+  "ServiceMonitor_Endpoint": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.endpoints",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
+  "ServiceMonitor_NamespaceSelector": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.namespaceSelector",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
+  "ServiceMonitor_Selector": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.selector",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "ServicePort": {
     "resourceType": "K8s::Core::ServicePort",
     "kind": "property",

package/dist/types/index.d.ts

@@ -1375,6 +1375,17 @@ export declare class PriorityLevelConfigurationList {
   readonly uid: string;
 }
 
+export declare class PrometheusRule {
+  constructor(props: {
+    /** Specification of desired alerting rule definitions for Prometheus. */
+    spec: Record<string, unknown>;
+    metadata?: Record<string, unknown>;
+  });
+  readonly name: string;
+  readonly namespace: string;
+  readonly uid: string;
+}
+
 export declare class PV {
   constructor(props: {
     /** Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata */
@@ -1853,6 +1864,18 @@ export declare class ServiceList {
   readonly uid: string;
 }
 
+export declare class ServiceMonitor {
+  constructor(props: {
+    /** Specification of desired Service selection for target discovery by
+Prometheus. */
+    spec: Record<string, unknown>;
+    metadata?: Record<string, unknown>;
+  });
+  readonly name: string;
+  readonly namespace: string;
+  readonly uid: string;
+}
+
 export declare class StatefulSet {
   constructor(props: {
     /** Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-k8s",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Kubernetes lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",

package/src/composites/composites.test.ts

@@ -1689,6 +1689,12 @@ describe("MonitoredService", () => {
     expect(spec.groups[0].rules[0].labels.severity).toBe("critical");
   });
 
+  test("serviceMonitor and prometheusRule emit the correct CRD kind (not Deployment)", () => {
+    const result = MonitoredService({ ...minProps, alertRules: [{ name: "A", expr: "1" }] });
+    expect((result.serviceMonitor as any).entityType).toBe("K8s::Monitoring::ServiceMonitor");
+    expect((result.prometheusRule as any).entityType).toBe("K8s::Monitoring::PrometheusRule");
+  });
+
   test("serviceMonitor has correct selector and endpoint", () => {
     const result = MonitoredService({ ...minProps, metricsPort: 9090, metricsPath: "/metrics", scrapeInterval: "15s" });
     const spec = p(result.serviceMonitor).spec as any;

package/src/composites/monitored-service.ts

@@ -7,7 +7,7 @@
  */
 
 import { Composite, mergeDefaults } from "@intentius/chant";
-import { Deployment, Service } from "../generated";
+import { Deployment, Service, ServiceMonitor, PrometheusRule } from "../generated";
 import type { ContainerSecurityContext } from "./security-context";
 
 export interface AlertRule {
@@ -68,8 +68,8 @@ export interface MonitoredServiceProps {
 export interface MonitoredServiceResult {
   deployment: InstanceType<typeof Deployment>;
   service: InstanceType<typeof Service>;
-  serviceMonitor: InstanceType<typeof Deployment>; // CRD — use Deployment as proxy type
-  prometheusRule?: InstanceType<typeof Deployment>; // CRD — use Deployment as proxy type
+  serviceMonitor: InstanceType<typeof ServiceMonitor>;
+  prometheusRule?: InstanceType<typeof PrometheusRule>;
 }
 
 /**
@@ -175,8 +175,7 @@ export const MonitoredService = Composite<MonitoredServiceProps>((props) => {
     },
   }, defs?.service));
 
-  // ServiceMonitor is a CRD — use Deployment constructor as a generic Declarable wrapper
-  const serviceMonitor = new Deployment(mergeDefaults({
+  const serviceMonitor = new ServiceMonitor(mergeDefaults({
     metadata: {
       name,
       ...(namespace && { namespace }),
@@ -199,7 +198,7 @@ export const MonitoredService = Composite<MonitoredServiceProps>((props) => {
   const result: Record<string, any> = { deployment, service, serviceMonitor };
 
   if (alertRules && alertRules.length > 0) {
-    result.prometheusRule = new Deployment(mergeDefaults({
+    result.prometheusRule = new PrometheusRule(mergeDefaults({
       metadata: {
         name: `${name}-alerts`,
         ...(namespace && { namespace }),

package/src/crd/crd-sources.ts

@@ -93,6 +93,20 @@ const COCKROACH_OPERATOR_CRD_BASE = `https://raw.githubusercontent.com/cockroach
 const CERT_MANAGER_VERSION = "v1.16.2";
 const CERT_MANAGER_CRD_BUNDLE = `https://github.com/cert-manager/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.crds.yaml`;
 
+/**
+ * Prometheus Operator CRDs — monitoring.coreos.com/v1
+ *
+ * Produces (the `monitoring.coreos.com` group maps to the `Monitoring`
+ * namespace):
+ *   K8s::Monitoring::ServiceMonitor  → apiVersion: monitoring.coreos.com/v1, kind: ServiceMonitor
+ *   K8s::Monitoring::PrometheusRule  → apiVersion: monitoring.coreos.com/v1, kind: PrometheusRule
+ *
+ * Operator install: kube-prometheus-stack chart, or
+ *   https://github.com/prometheus-operator/prometheus-operator
+ */
+const PROM_OPERATOR_VERSION = "v0.79.2";
+const PROM_OPERATOR_CRD_BASE = `https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${PROM_OPERATOR_VERSION}/example/prometheus-operator-crd`;
+
 export const CRD_SOURCES: CRDSource[] = [
   { type: "url", url: `${KUBERAY_CRD_BASE}/ray.io_rayclusters.yaml` },
   { type: "url", url: `${KUBERAY_CRD_BASE}/ray.io_rayjobs.yaml` },
@@ -107,4 +121,6 @@ export const CRD_SOURCES: CRDSource[] = [
   { type: "url", url: `${GATEWAY_API_CRD_BASE}/gateway.networking.k8s.io_referencegrants.yaml` },
   { type: "url", url: `${COCKROACH_OPERATOR_CRD_BASE}/crdb.cockroachlabs.com_crdbclusters.yaml` },
   { type: "url", url: CERT_MANAGER_CRD_BUNDLE },
+  { type: "url", url: `${PROM_OPERATOR_CRD_BASE}/monitoring.coreos.com_servicemonitors.yaml` },
+  { type: "url", url: `${PROM_OPERATOR_CRD_BASE}/monitoring.coreos.com_prometheusrules.yaml` },
 ];

package/src/generated/index.d.ts

@@ -1375,6 +1375,17 @@ export declare class PriorityLevelConfigurationList {
   readonly uid: string;
 }
 
+export declare class PrometheusRule {
+  constructor(props: {
+    /** Specification of desired alerting rule definitions for Prometheus. */
+    spec: Record<string, unknown>;
+    metadata?: Record<string, unknown>;
+  });
+  readonly name: string;
+  readonly namespace: string;
+  readonly uid: string;
+}
+
 export declare class PV {
   constructor(props: {
     /** Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata */
@@ -1853,6 +1864,18 @@ export declare class ServiceList {
   readonly uid: string;
 }
 
+export declare class ServiceMonitor {
+  constructor(props: {
+    /** Specification of desired Service selection for target discovery by
+Prometheus. */
+    spec: Record<string, unknown>;
+    metadata?: Record<string, unknown>;
+  });
+  readonly name: string;
+  readonly namespace: string;
+  readonly uid: string;
+}
+
 export declare class StatefulSet {
   constructor(props: {
     /** Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata */

package/src/generated/index.ts

@@ -108,6 +108,7 @@ export const PriorityClass = createResource("K8s::Scheduling::PriorityClass", "k
 export const PriorityClassList = createResource("K8s::Scheduling::PriorityClassList", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const PriorityLevelConfiguration = createResource("K8s::Flowcontrol::PriorityLevelConfiguration", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const PriorityLevelConfigurationList = createResource("K8s::Flowcontrol::PriorityLevelConfigurationList", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
+export const PrometheusRule = createResource("K8s::Monitoring::PrometheusRule", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const PV = createResource("K8s::Core::PersistentVolume", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const PVC = createResource("K8s::Core::PersistentVolumeClaim", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const RayCluster = createResource("K8s::Ray::RayCluster", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
@@ -146,6 +147,7 @@ export const ServiceAccountList = createResource("K8s::Core::ServiceAccountList"
 export const ServiceCIDR = createResource("K8s::Networking::ServiceCIDR", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const ServiceCIDRList = createResource("K8s::Networking::ServiceCIDRList", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const ServiceList = createResource("K8s::Core::ServiceList", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
+export const ServiceMonitor = createResource("K8s::Monitoring::ServiceMonitor", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const StatefulSet = createResource("K8s::Apps::StatefulSet", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const StatefulSetList = createResource("K8s::Apps::StatefulSetList", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
 export const Status = createResource("K8s::Core::Status", "k8s", {"name":"name","namespace":"namespace","uid":"uid"});
@@ -264,6 +266,7 @@ export const PodSpec = createProperty("K8s::Core::PodSpec", "k8s");
 export const PodTemplateSpec = createProperty("K8s::Core::PodTemplateSpec", "k8s");
 export const PolicyRule = createProperty("K8s::Rbac::PolicyRule", "k8s");
 export const Probe = createProperty("K8s::Core::Probe", "k8s");
+export const PrometheusRule_Group = createProperty("K8s::Monitoring::PrometheusRule.groups", "k8s");
 export const RayCluster_AutoscalerOptions = createProperty("K8s::Ray::RayCluster.autoscalerOptions", "k8s");
 export const RayCluster_GcsFaultToleranceOptions = createProperty("K8s::Ray::RayCluster.gcsFaultToleranceOptions", "k8s");
 export const RayCluster_HeadGroupSpec = createProperty("K8s::Ray::RayCluster.headGroupSpec", "k8s");
@@ -282,6 +285,10 @@ export const RollingUpdateDeployment = createProperty("K8s::Apps::RollingUpdateD
 export const SecretKeySelector = createProperty("K8s::Core::SecretKeySelector", "k8s");
 export const SecurityContext = createProperty("K8s::Core::SecurityContext", "k8s");
 export const ServiceBackendPort = createProperty("K8s::Networking::ServiceBackendPort", "k8s");
+export const ServiceMonitor_AttachMetadata = createProperty("K8s::Monitoring::ServiceMonitor.attachMetadata", "k8s");
+export const ServiceMonitor_Endpoint = createProperty("K8s::Monitoring::ServiceMonitor.endpoints", "k8s");
+export const ServiceMonitor_NamespaceSelector = createProperty("K8s::Monitoring::ServiceMonitor.namespaceSelector", "k8s");
+export const ServiceMonitor_Selector = createProperty("K8s::Monitoring::ServiceMonitor.selector", "k8s");
 export const ServicePort = createProperty("K8s::Core::ServicePort", "k8s");
 export const Subject = createProperty("K8s::Rbac::Subject", "k8s");
 export const TCPSocketAction = createProperty("K8s::Core::TCPSocketAction", "k8s");

package/src/generated/lexicon-k8s.json

@@ -187,6 +187,11 @@
     "kind": "property",
     "lexicon": "k8s"
   },
+  "AttachMetadata": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.attachMetadata",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "AutoscalerOptions": {
     "resourceType": "K8s::Ray::RayCluster.autoscalerOptions",
     "kind": "property",
@@ -655,6 +660,11 @@
     "apiVersion": "resource.k8s.io/v1beta1",
     "gvkKind": "DeviceClassList"
   },
+  "Endpoint": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.endpoints",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "EndpointSlice": {
     "resourceType": "K8s::Discovery::EndpointSlice",
     "kind": "resource",
@@ -826,6 +836,11 @@
     "kind": "property",
     "lexicon": "k8s"
   },
+  "Group": {
+    "resourceType": "K8s::Monitoring::PrometheusRule.groups",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "HPA": {
     "resourceType": "K8s::Autoscaling::HorizontalPodAutoscaler",
     "kind": "resource",
@@ -1154,6 +1169,11 @@
     "kind": "property",
     "lexicon": "k8s"
   },
+  "NamespaceSelector": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.namespaceSelector",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "NetPol": {
     "resourceType": "K8s::Networking::NetworkPolicy",
     "kind": "resource",
@@ -1475,6 +1495,18 @@
       }
     }
   },
+  "PrometheusRule": {
+    "resourceType": "K8s::Monitoring::PrometheusRule",
+    "kind": "resource",
+    "lexicon": "k8s",
+    "apiVersion": "monitoring.coreos.com/v1",
+    "gvkKind": "PrometheusRule"
+  },
+  "PrometheusRule_Group": {
+    "resourceType": "K8s::Monitoring::PrometheusRule.groups",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "RayCluster": {
     "resourceType": "K8s::Ray::RayCluster",
     "kind": "resource",
@@ -1784,6 +1816,11 @@
       }
     }
   },
+  "Selector": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.selector",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "SelfSubjectAccessReview": {
     "resourceType": "K8s::Authorization::SelfSubjectAccessReview",
     "kind": "resource",
@@ -1862,6 +1899,33 @@
     "apiVersion": "v1",
     "gvkKind": "ServiceList"
   },
+  "ServiceMonitor": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor",
+    "kind": "resource",
+    "lexicon": "k8s",
+    "apiVersion": "monitoring.coreos.com/v1",
+    "gvkKind": "ServiceMonitor"
+  },
+  "ServiceMonitor_AttachMetadata": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.attachMetadata",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
+  "ServiceMonitor_Endpoint": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.endpoints",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
+  "ServiceMonitor_NamespaceSelector": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.namespaceSelector",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
+  "ServiceMonitor_Selector": {
+    "resourceType": "K8s::Monitoring::ServiceMonitor.selector",
+    "kind": "property",
+    "lexicon": "k8s"
+  },
   "ServicePort": {
     "resourceType": "K8s::Core::ServicePort",
     "kind": "property",