Improvements

Author: 0msokolowski0

charts/gpu-metrics-exporter/templates/daemonset.yaml

@@ -30,7 +30,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- $provider := include "gpu-metrics-exporter.provider" . }}
-      {{- if eq (required ".Values.provider is required (gke|eks|aks|omni)" $provider) "eks" }}
+      {{- if eq (required "provider or global.castai.provider is required (gke|eks|aks|omni)" $provider) "eks" }}
       priorityClassName: system-node-critical
       {{- end }}
       serviceAccountName: {{ include "gpu-metrics-exporter.serviceAccountName" . }}

charts/gpu-metrics-exporter/templates/gpu-exporter-configmap.yaml

@@ -6,7 +6,7 @@ data:
 {{- if and (not .Values.castai.clusterIdSecretRef) (not .Values.castai.clusterIdConfigMapKeyRef.name) }}
   CLUSTER_ID: {{ required "castai.clusterId must be provided" .Values.castai.clusterId | quote }}
 {{- end }}
-  CAST_API: {{ required "castai.apiUrl must be provided" (include "gpu-metrics-exporter.apiURL" .) | quote }}
+  CAST_API: {{ required "castai.apiUrl or global.castai.apiURL must be provided" (include "gpu-metrics-exporter.apiURL" .) | quote }}
 
 {{- $config := .Values.gpuMetricsExporter.config | default dict }}
 {{- $otherConfig := omit $config "CLUSTER_ID" "CAST_API"}}

charts/gpu-metrics-exporter/templates/validation.yaml

@@ -8,8 +8,19 @@ Validation for provider parameter
 {{- end }}
 
 {{/*
-Require either clusterId or clusterIdSecretRef
+Require one of clusterId, clusterIdSecretRef, or clusterIdConfigMapKeyRef
 */}}
 {{- if and (not .Values.castai.clusterId) (not .Values.castai.clusterIdSecretRef) (not .Values.castai.clusterIdConfigMapKeyRef.name) }}
 {{- fail "one of castai.clusterId, castai.clusterIdSecretRef, or castai.clusterIdConfigMapKeyRef must be set" }}
 {{- end }}
+
+{{/*
+Ensure mutual exclusivity of cluster ID sources
+*/}}
+{{- $clusterIdCount := 0 }}
+{{- if .Values.castai.clusterId }}{{ $clusterIdCount = add $clusterIdCount 1 }}{{ end }}
+{{- if .Values.castai.clusterIdSecretRef }}{{ $clusterIdCount = add $clusterIdCount 1 }}{{ end }}
+{{- if .Values.castai.clusterIdConfigMapKeyRef.name }}{{ $clusterIdCount = add $clusterIdCount 1 }}{{ end }}
+{{- if gt (int $clusterIdCount) 1 }}
+{{- fail "only one of castai.clusterId, castai.clusterIdSecretRef, or castai.clusterIdConfigMapKeyRef may be set" }}
+{{- end }}

charts/gpu-metrics-exporter/tests/configmap_ref_test.yaml

@@ -27,9 +27,8 @@ tests:
                 name: castai-agent-metadata
                 key: CLUSTER_ID
 
-  - it: No gpu-metrics-exporter Secret contains the API key (apiKeySecretRef is used instead)
+  - it: No gpu-metrics-exporter Secret is rendered (apiKeySecretRef is used instead)
     template: secret.yaml
     asserts:
-      - notEqual:
-          path: data.API_KEY
-          value: "bXlrZXk="
+      - hasDocuments:
+          count: 0

charts/gpu-metrics-exporter/tests/validation_test.yaml

@@ -0,0 +1,33 @@
+suite: mutual exclusivity of cluster ID sources
+templates:
+  - validation.yaml
+set:
+  castai.apiKey: "test-key"
+  castai.apiUrl: "https://api.cast.ai"
+  provider: "gke"
+tests:
+  - it: fails when both clusterIdSecretRef and clusterIdConfigMapKeyRef are set
+    set:
+      castai.clusterIdSecretRef: "my-secret"
+      castai.clusterIdConfigMapKeyRef.name: "my-configmap"
+      castai.clusterIdConfigMapKeyRef.key: "CLUSTER_ID"
+    asserts:
+      - failedTemplate:
+          errorMessage: "only one of castai.clusterId, castai.clusterIdSecretRef, or castai.clusterIdConfigMapKeyRef may be set"
+
+  - it: fails when both clusterId and clusterIdSecretRef are set
+    set:
+      castai.clusterId: "my-cluster"
+      castai.clusterIdSecretRef: "my-secret"
+    asserts:
+      - failedTemplate:
+          errorMessage: "only one of castai.clusterId, castai.clusterIdSecretRef, or castai.clusterIdConfigMapKeyRef may be set"
+
+  - it: fails when both clusterId and clusterIdConfigMapKeyRef are set
+    set:
+      castai.clusterId: "my-cluster"
+      castai.clusterIdConfigMapKeyRef.name: "my-configmap"
+      castai.clusterIdConfigMapKeyRef.key: "CLUSTER_ID"
+    asserts:
+      - failedTemplate:
+          errorMessage: "only one of castai.clusterId, castai.clusterIdSecretRef, or castai.clusterIdConfigMapKeyRef may be set"