feat: reorg builds/deploys

jtschelling · jtschelling · commit 034aba95f3ba · 2025-12-29T10:40:11.000-08:00
diff --git a/.ko.yaml b/.ko.yaml
@@ -154,87 +154,19 @@ builds:
       org.opencontainers.image.revision: "{{.Env.GIT_COMMIT}}"
       org.opencontainers.image.created: "{{.Env.BUILD_DATE}}"
 
-  - id: janitor-provider-aws
-    dir: providers/aws
+  - id: janitor-provider
+    dir: janitor-provider
     main: .
     ldflags:
       - "-s -w"
       - "-X main.version={{.Env.VERSION}} -X main.commit={{.Env.GIT_COMMIT}} -X main.date={{.Env.BUILD_DATE}}"
     annotations:
-      org.opencontainers.image.description: "AWS provider for the NVSentinel Janitor"
+      org.opencontainers.image.description: "Example provider for NVSentinel Janitor"
     labels:
       org.opencontainers.image.source: "https://github.com/nvidia/nvsentinel"
       org.opencontainers.image.licenses: "Apache-2.0"
-      org.opencontainers.image.title: "janitor-provider-aws"
-      org.opencontainers.image.description: "AWS implementation of the CSP provider interface for Janitor"
-      org.opencontainers.image.version: "{{.Env.VERSION}}"
-      org.opencontainers.image.revision: "{{.Env.GIT_COMMIT}}"
-      org.opencontainers.image.created: "{{.Env.BUILD_DATE}}"
-
-  - id: janitor-provider-azure
-    dir: providers/azure
-    main: .
-    ldflags:
-      - "-s -w"
-      - "-X main.version={{.Env.VERSION}} -X main.commit={{.Env.GIT_COMMIT}} -X main.date={{.Env.BUILD_DATE}}"
-    annotations:
-      org.opencontainers.image.description: "Azure provider for the NVSentinel Janitor"
-    labels:
-      org.opencontainers.image.source: "https://github.com/nvidia/nvsentinel"
-      org.opencontainers.image.licenses: "Apache-2.0"
-      org.opencontainers.image.title: "janitor-provider-azure"
-      org.opencontainers.image.description: "Azure implementation of the CSP provider interface for Janitor"
-      org.opencontainers.image.version: "{{.Env.VERSION}}"
-      org.opencontainers.image.revision: "{{.Env.GIT_COMMIT}}"
-      org.opencontainers.image.created: "{{.Env.BUILD_DATE}}"
-
-  - id: janitor-provider-gcp
-    dir: providers/gcp
-    main: .
-    ldflags:
-      - "-s -w"
-      - "-X main.version={{.Env.VERSION}} -X main.commit={{.Env.GIT_COMMIT}} -X main.date={{.Env.BUILD_DATE}}"
-    annotations:
-      org.opencontainers.image.description: "GCP provider for the NVSentinel Janitor"
-    labels:
-      org.opencontainers.image.source: "https://github.com/nvidia/nvsentinel"
-      org.opencontainers.image.licenses: "Apache-2.0"
-      org.opencontainers.image.title: "janitor-provider-gcp"
-      org.opencontainers.image.description: "GCP implementation of the CSP provider interface for Janitor"
-      org.opencontainers.image.version: "{{.Env.VERSION}}"
-      org.opencontainers.image.revision: "{{.Env.GIT_COMMIT}}"
-      org.opencontainers.image.created: "{{.Env.BUILD_DATE}}"
-
-  - id: janitor-provider-kwok
-    dir: providers/kwok
-    main: .
-    ldflags:
-      - "-s -w"
-      - "-X main.version={{.Env.VERSION}} -X main.commit={{.Env.GIT_COMMIT}} -X main.date={{.Env.BUILD_DATE}}"
-    annotations:
-      org.opencontainers.image.description: "KWOK provider for the NVSentinel Janitor"
-    labels:
-      org.opencontainers.image.source: "https://github.com/nvidia/nvsentinel"
-      org.opencontainers.image.licenses: "Apache-2.0"
-      org.opencontainers.image.title: "janitor-provider-kwok"
-      org.opencontainers.image.description: "KWOK implementation of the CSP provider interface for Janitor"
-      org.opencontainers.image.version: "{{.Env.VERSION}}"
-      org.opencontainers.image.revision: "{{.Env.GIT_COMMIT}}"
-      org.opencontainers.image.created: "{{.Env.BUILD_DATE}}"
-
-  - id: janitor-provider-oci
-    dir: providers/oci
-    main: .
-    ldflags:
-      - "-s -w"
-      - "-X main.version={{.Env.VERSION}} -X main.commit={{.Env.GIT_COMMIT}} -X main.date={{.Env.BUILD_DATE}}"
-    annotations:
-      org.opencontainers.image.description: "OCI provider for the NVSentinel Janitor"
-    labels:
-      org.opencontainers.image.source: "https://github.com/nvidia/nvsentinel"
-      org.opencontainers.image.licenses: "Apache-2.0"
-      org.opencontainers.image.title: "janitor-provider-oci"
-      org.opencontainers.image.description: "OCI implementation of the CSP provider interface for Janitor"
+      org.opencontainers.image.title: "NVSentinel Janitor-Provider"
+      org.opencontainers.image.description: "Example implementation of the CSP provider interface for Janitor"
       org.opencontainers.image.version: "{{.Env.VERSION}}"
       org.opencontainers.image.revision: "{{.Env.GIT_COMMIT}}"
       org.opencontainers.image.created: "{{.Env.BUILD_DATE}}"
diff --git a/distros/kubernetes/nvsentinel/Chart.yaml b/distros/kubernetes/nvsentinel/Chart.yaml
@@ -55,9 +55,9 @@ dependencies:
   - name: janitor
     version: "0.1.0"
     condition: global.janitor.enabled
-  - name: janitor-provider-kwok
+  - name: janitor-provider
     version: "0.1.0"
-    condition: global.janitor.enabled && global.janitor.provider == "kwok"
+    condition: global.janitorProvider.enabled
   - name: metadata-collector
     version: "0.1.0"
     condition: global.metadataCollector.enabled
diff --git a/distros/kubernetes/nvsentinel/charts/janitor-provider/Chart.yaml b/distros/kubernetes/nvsentinel/charts/janitor-provider/Chart.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 apiVersion: v2
-name: janitor-provider-kwok
-description: KWOK provider for NVSentinel Janitor
+name: janitor-provider
+description: Example provider for NVSentinel Janitor
 type: application
 version: 0.1.0
diff --git a/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/_helpers.tpl b/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/_helpers.tpl
diff --git a/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/deployment.yaml b/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "provider.serviceAccountName" . }}
       containers:
-        - name: janitor-provider-kwok
+        - name: janitor-provider
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default ((.Values.global).image).tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
diff --git a/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/networkpolicy.yaml b/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/networkpolicy.yaml
diff --git a/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/service.yaml b/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/service.yaml
diff --git a/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/serviceaccount.yaml b/distros/kubernetes/nvsentinel/charts/janitor-provider/templates/serviceaccount.yaml
diff --git a/distros/kubernetes/nvsentinel/charts/janitor-provider/values.yaml b/distros/kubernetes/nvsentinel/charts/janitor-provider/values.yaml
@@ -16,12 +16,12 @@ replicaCount: 1
 
 # Image configuration
 image:
-  repository: ghcr.io/nvidia/nvsentinel/janitor-provider-kwok
+  repository: ghcr.io/nvidia/nvsentinel/janitor-provider
   pullPolicy: IfNotPresent
   tag: ""
 
 nameOverride: ""
-fullnameOverride: "janitor-provider-kwok"
+fullnameOverride: "janitor-provider"
 
 serviceAccount:
   # Specifies whether a service account should be created
diff --git a/distros/kubernetes/nvsentinel/values-tilt.yaml b/distros/kubernetes/nvsentinel/values-tilt.yaml
@@ -76,7 +76,9 @@ global:
 
   janitor:
     enabled: true
-    provider: "kwok"
+
+  janitorProvider:
+    enabled: true
 
   mongodbStore:
     enabled: true
@@ -281,7 +283,7 @@ health-events-analyzer:
 
 janitor:
   config:
-    cspProviderHost: "janitor-provider-kwok.nvsentinel.svc.cluster.local:50051"
+    cspProviderHost: "janitor-provider.nvsentinel.svc.cluster.local:50051"
   webhook:
     certIssuer: "janitor-selfsigned-issuer"
 
@@ -293,7 +295,7 @@ labeler:
 
 csp-health-monitor:
   logLevel: debug
-  cspName: "gcp" # this will be updated to aws as well dynamically during tests 
+  cspName: "gcp" # this will be updated to aws as well dynamically during tests
   quarantineTriggerEngine:
     logLevel: debug
   configToml:
@@ -304,17 +306,17 @@ csp-health-monitor:
       endpointOverride: "csp-api-mock.nvsentinel.svc.cluster.local:50051"
     aws:
       endpointOverride: "http://csp-api-mock.nvsentinel.svc.cluster.local:8080/aws/health"
-  
+
   affinity:
     podAntiAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
-      - labelSelector:
-          matchLabels:
-            app.kubernetes.io/name: kwok
-        namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: kube-system
-        topologyKey: kubernetes.io/hostname
+        - labelSelector:
+            matchLabels:
+              app.kubernetes.io/name: kwok
+          namespaceSelector:
+            matchLabels:
+              kubernetes.io/metadata.name: kube-system
+          topologyKey: kubernetes.io/hostname
 
 # Enable node metadata enrichment for testing
 platformConnector:
@@ -323,32 +325,32 @@ platformConnector:
     maxNodeConditionMessageLength: 1024
     qps: 5.0
     burst: 10
-  
+
   pipeline:
     - name: MetadataAugmentor
       enabled: true
       config: /etc/config/metadata.toml
-    
+
     - name: OverrideTransformer
       enabled: true
       config: /etc/config/overrides.toml
-  
+
   transformers:
     MetadataAugmentor:
       cacheSize: 50
       cacheTTLSeconds: 3600
       allowedLabels:
         - "topology.kubernetes.io/zone"
         - "topology.kubernetes.io/region"
-    
+
     OverrideTransformer:
       rules:
-      - name: "escalate-xid-94"
-        when: 'event.agent == "syslog-health-monitor" && "94" in event.errorCode'
-        override:
-          isFatal: true
-          recommendedAction: "CONTACT_SUPPORT"
-    
+        - name: "escalate-xid-94"
+          when: 'event.agent == "syslog-health-monitor" && "94" in event.errorCode'
+          override:
+            isFatal: true
+            recommendedAction: "CONTACT_SUPPORT"
+
     # - name: "zone-specific-override"
     #   when: 'event.metadata["topology.kubernetes.io/zone"] == "us-west1-a" && event.componentClass == "GPU"'
     #   override:
diff --git a/distros/kubernetes/nvsentinel/values.yaml b/distros/kubernetes/nvsentinel/values.yaml
@@ -38,12 +38,12 @@ global:
 
   # Audit logging configuration
   auditLogging:
-    enabled: false  # Enable/disable audit logging for all components
-    logRequestBody: false  # Log request body in audit logs (may contain sensitive data)
-    maxSizeMB: 100  # Maximum size of each audit log file in MB
-    maxBackups: 7  # Maximum number of rotated log files to keep
-    maxAgeDays: 30  # Maximum age of rotated log files in days
-    compress: true  # Compress rotated log files
+    enabled: false # Enable/disable audit logging for all components
+    logRequestBody: false # Log request body in audit logs (may contain sensitive data)
+    maxSizeMB: 100 # Maximum size of each audit log file in MB
+    maxBackups: 7 # Maximum number of rotated log files to keep
+    maxAgeDays: 30 # Maximum age of rotated log files in days
+    compress: true # Compress rotated log files
 
   nodeSelector: {}
   tolerations: []
@@ -64,6 +64,8 @@ global:
     enabled: false
   janitor:
     enabled: false
+  janitorProvider:
+    enabled: false
   cspHealthMonitor:
     enabled: false
   syslogHealthMonitor:
@@ -123,11 +125,11 @@ platformConnector:
     - name: MetadataAugmentor
       enabled: false
       config: /etc/config/metadata.toml
-    
+
     - name: OverrideTransformer
       enabled: false
       config: /etc/config/overrides.toml
-  
+
   # Transformer-specific configurations
   transformers:
     # Metadata augmentor - enriches events with node labels and provider info
@@ -156,7 +158,7 @@ platformConnector:
         - "cloud.google.com/gce-topology-block"
         - "cloud.google.com/gce-topology-host"
         - "cloud.google.com/gce-topology-subblock"
-    
+
     # Property overrides - uses CEL expressions to override event properties
     OverrideTransformer:
       rules: []
diff --git a/janitor-provider/Tiltfile b/janitor-provider/Tiltfile
@@ -0,0 +1,21 @@
+# Copyright (c) 2025, NVIDIA CORPORATION.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Build and deploy
+custom_build(
+    'ghcr.io/nvidia/nvsentinel/janitor-provider',
+    '../scripts/ko-tilt-build.sh . $EXPECTED_REF',
+    deps=['./', '../store-client'],
+    skips_local_docker=True
+)
diff --git a/janitor-provider/go.mod b/janitor-provider/go.mod
@@ -1,8 +1,6 @@
 module github.com/nvidia/nvsentinel/janitor-provider
 
-go 1.25.0
-
-toolchain go1.25.3
+go 1.25.5
 
 replace github.com/nvidia/nvsentinel/api => ../api
 
diff --git a/janitor-provider/main.go b/janitor-provider/main.go
@@ -1,4 +1,4 @@
-package janitorprovider
+package main
 
 import (
 	"context"
diff --git a/scripts/build-image-list.sh b/scripts/build-image-list.sh
@@ -52,6 +52,7 @@ declare -a dynamic_images=(
   "${CONTAINER_REGISTRY}/${CONTAINER_ORG}/nvsentinel/gpu-health-monitor:${SAFE_REF_NAME}-dcgm-4.x"
   "${CONTAINER_REGISTRY}/${CONTAINER_ORG}/nvsentinel/health-events-analyzer:${SAFE_REF_NAME}"
   "${CONTAINER_REGISTRY}/${CONTAINER_ORG}/nvsentinel/janitor:${SAFE_REF_NAME}"
+  "${CONTAINER_REGISTRY}/${CONTAINER_ORG}/nvsentinel/janitor-provider:${SAFE_REF_NAME}"
   "${CONTAINER_REGISTRY}/${CONTAINER_ORG}/nvsentinel/kubernetes-object-monitor:${SAFE_REF_NAME}"
   "${CONTAINER_REGISTRY}/${CONTAINER_ORG}/nvsentinel/labeler:${SAFE_REF_NAME}"
   "${CONTAINER_REGISTRY}/${CONTAINER_ORG}/nvsentinel/log-collector:${SAFE_REF_NAME}"
diff --git a/scripts/buildko.sh b/scripts/buildko.sh
@@ -48,6 +48,7 @@ if [ ! -f go.work ]; then
     ./health-monitors/csp-health-monitor \
     ./health-monitors/kubernetes-object-monitor \
     ./janitor \
+    ./janitor-provider \
     ./labeler \
     ./node-drainer \
     ./platform-connectors
@@ -62,6 +63,7 @@ ko build "${KO_FLAGS[@]}" \
   ./health-monitors/csp-health-monitor/cmd/maintenance-notifier \
   ./health-monitors/kubernetes-object-monitor \
   ./janitor \
+  ./janitor-provider \
   ./labeler \
   ./node-drainer \
   ./platform-connectors 
@@ -81,4 +83,4 @@ jq -R -s '
 ' digests.txt | tee images.json
 
 # Export images.json content to GitHub Actions output
-echo "images=$(jq -c . images.json)" >> "$GITHUB_OUTPUT"
+echo "images=$(jq -c . images.json)" >> "$GITHUB_OUTPUT"
diff --git a/scripts/check-image-attestations.sh b/scripts/check-image-attestations.sh
@@ -66,6 +66,7 @@ KO_IMAGES=(
     "nvsentinel/labeler"
     "nvsentinel/node-drainer"
     "nvsentinel/janitor"
+    "nvsentinel/janitor-provider"
     "nvsentinel/platform-connectors"
 )
 
diff --git a/tilt/Tiltfile b/tilt/Tiltfile
@@ -115,7 +115,7 @@ k8s_yaml('./nvidia-dcgm-daemonset.yaml')
 include('../fault-quarantine/Tiltfile')
 include('../fault-remediation/Tiltfile')
 include('../janitor/Tiltfile')
-include('../providers/kwok/Tiltfile')
+include('../janitor-provider/Tiltfile')
 include('../node-drainer/Tiltfile')
 include('../platform-connectors/Tiltfile')
 include('./simple-health-client/Tiltfile')
@@ -243,7 +243,7 @@ k8s_resource(
 )
 
 k8s_resource(
-    'janitor-provider-kwok',
+    'janitor-provider',
     resource_deps=['janitor'],
 )
 
