feat(skyhook): temporarily remove skyhook tuning due to bugs

ayuskauskas · ayuskauskas · commit 628cab278a92 · 2026-02-19T12:43:01.000-08:00
diff --git a/recipes/components/skyhook-customizations/manifests/no-op.yaml b/recipes/components/skyhook-customizations/manifests/no-op.yaml
@@ -0,0 +1,65 @@
+# 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.
+
+# Skyhook H100 EKS Ubuntu Customization
+# Minimal templating - only tolerations/nodeSelectors are dynamic for CLI flag support
+#
+# This customization configures H100 GPU nodes on Ubuntu with:
+# - GRUB parameters for hugepages and nokaslr
+# - Containerd service limits
+# - Sysctl kernel tuning parameters
+{{- $cust := index .Values "skyhook-customizations" }}
+{{- if ne (toString (index $cust "enabled")) "false" }}
+---
+apiVersion: skyhook.nvidia.com/v1alpha1
+kind: Skyhook
+metadata:
+  annotations:
+    # Helm hooks ensure this CR is applied after skyhook-operator CRD is installed
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation
+  labels:
+    app.kubernetes.io/part-of: skyhook-operator
+    app.kubernetes.io/created-by: eidos
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+  name: no-op
+  namespace: {{ .Release.Namespace }}
+spec:
+  runtimeRequired: true
+  # Dynamic: Supports --accelerated-node-toleration CLI flag
+  additionalTolerations:
+    {{- if $cust.acceleratedTolerations }}
+    {{- toYaml $cust.acceleratedTolerations | nindent 4 }}
+    {{- else }}
+    - key: dedicated
+      operator: Exists
+    {{- end }}
+  # Dynamic: Supports --accelerated-node-selector CLI flag
+  {{- if $cust.acceleratedNodeSelector }}
+  nodeSelectors:
+    matchLabels:
+      {{- toYaml $cust.acceleratedNodeSelector | nindent 6 }}
+  {{- end }}
+  # Static: Baked-in tuning for H100 Ubuntu training
+  packages:
+    no-op:
+      image: ghcr.io/nvidia/skyhook-packages/shellscript
+      version: 1.1.1"
+      configMap:
+        apply.sh: |
+          #!/bin/bash
+          echo "No-op package applied"
+{{- end }}
diff --git a/recipes/components/skyhook-customizations/manifests/tuning.yaml b/recipes/components/skyhook-customizations/manifests/tuning.yaml
@@ -41,17 +41,17 @@ spec:
   runtimeRequired: true
   # Dynamic: Supports --accelerated-node-toleration CLI flag
   additionalTolerations:
-    {{- if $cust.tolerations }}
-    {{- toYaml $cust.tolerations | nindent 4 }}
+    {{- if $cust.acceleratedTolerations }}
+    {{- toYaml $cust.acceleratedTolerations | nindent 4 }}
     {{- else }}
     - key: dedicated
       operator: Exists
     {{- end }}
   # Dynamic: Supports --accelerated-node-selector CLI flag
-  {{- if $cust.nodeSelector }}
+  {{- if $cust.acceleratedNodeSelector }}
   nodeSelectors:
     matchLabels:
-      {{- toYaml $cust.nodeSelector | nindent 6 }}
+      {{- toYaml $cust.acceleratedNodeSelector | nindent 6 }}
   {{- end }}
   # Static: Baked-in tuning for H100 Ubuntu training
   packages:
diff --git a/recipes/overlays/h100-eks-inference.yaml b/recipes/overlays/h100-eks-inference.yaml
@@ -33,13 +33,15 @@ spec:
       value: ">= 1.32.4"
 
   componentRefs:
+
     - name: skyhook-customizations
       type: Helm
       manifestFiles:
-        - components/skyhook-customizations/manifests/tuning.yaml
+        # Temporarily disabled until skyhook-customizations is fixed
+        - components/skyhook-customizations/manifests/no-op.yaml
       overrides:
         service: aws
         accelerator: h100
         intent: inference
       dependencyRefs:
-        - skyhook-operator
+        - skyhook-operator
diff --git a/recipes/overlays/h100-eks-training.yaml b/recipes/overlays/h100-eks-training.yaml
@@ -33,7 +33,6 @@ spec:
       value: ">= 1.32.4"
 
   componentRefs:
-
     # H100-specific GPU Operator overrides (inherits valuesFile from eks-training)
     - name: gpu-operator
       type: Helm
@@ -46,7 +45,8 @@ spec:
     - name: skyhook-customizations
       type: Helm
       manifestFiles:
-        - components/skyhook-customizations/manifests/tuning.yaml
+        # Temporarily disabled until skyhook-customizations is fixed
+        - components/skyhook-customizations/manifests/no-op.yaml
       overrides:
         service: aws
         accelerator: h100
diff --git a/recipes/registry.yaml b/recipes/registry.yaml
@@ -39,6 +39,41 @@ apiVersion: eidos.nvidia.com/v1alpha1
 kind: ComponentRegistry
 
 components:
+  - name: skyhook-operator
+    displayName: skyhook
+    valueOverrideKeys:
+      - skyhook
+    helm:
+      defaultRepository: https://nvidia.github.io/skyhook
+      defaultChart: skyhook-operator
+      defaultNamespace: skyhook
+    nodeScheduling:
+      system:
+        nodeSelectorPaths:
+          - controllerManager.selectors
+        tolerationPaths:
+          - controllerManager.tolerations
+
+  - name: skyhook-customizations
+    displayName: skyhook-customizations
+    valueOverrideKeys:
+      - skyhookcustomizations
+    helm:
+      # Manifest-only component - no external Helm chart, uses manifestFiles
+      defaultRepository: ""
+      defaultNamespace: skyhook
+    nodeScheduling:
+      system:
+        nodeSelectorPaths:
+          - systemNodeSelector
+        tolerationPaths:
+          - systemTolerations
+      accelerated:
+        nodeSelectorPaths:
+          - acceleratedNodeSelector
+        tolerationPaths:
+          - acceleratedTolerations
+
   - name: gpu-operator
     displayName: gpu-operator
     valueOverrideKeys:
@@ -119,36 +154,6 @@ components:
           - cainjector.tolerations
           - startupapicheck.tolerations
 
-  - name: skyhook-operator
-    displayName: skyhook
-    valueOverrideKeys:
-      - skyhook
-    helm:
-      defaultRepository: https://nvidia.github.io/skyhook
-      defaultChart: skyhook-operator
-      defaultNamespace: skyhook
-    nodeScheduling:
-      system:
-        nodeSelectorPaths:
-          - controllerManager.selectors
-        tolerationPaths:
-          - controllerManager.tolerations
-
-  - name: skyhook-customizations
-    displayName: skyhook-customizations
-    valueOverrideKeys:
-      - skyhookcustomizations
-    helm:
-      # Manifest-only component - no external Helm chart, uses manifestFiles
-      defaultRepository: ""
-      defaultNamespace: skyhook
-    nodeScheduling:
-      accelerated:
-        nodeSelectorPaths:
-          - nodeSelector
-        tolerationPaths:
-          - tolerations
-
   - name: nvsentinel
     displayName: nvsentinel
     valueOverrideKeys:
