Release bundle charts v0.0.35 and update cortex core chart versions to 0.0.22

.github/renovate.json

@@ -11,7 +11,7 @@
   ],
   "commitMessageAction": "Renovate: Update",
   "constraints": {
-    "go": "1.25"
+    "go": "1.26"
   },
   "dependencyDashboardOSVVulnerabilitySummary": "all",
   "osvVulnerabilityAlerts": true,
@@ -27,7 +27,7 @@
       "matchPackageNames": [
         "golang"
       ],
-      "allowedVersions": "1.25.x"
+      "allowedVersions": "1.26.x"
     },
     {
       "matchPackageNames": [

.gitignore

@@ -21,11 +21,16 @@ vendor/**
 go.work
 go.work.sum
 
-# env file
-.env
 
 # Just in case someone decides to put the secrets into the project dir.
 cortex.secrets.yaml
 
-# macOS specific files
-.DS_Store
+# exclude dot files
+.*
+# except
+!.dockerignore
+!.editorconfig
+!.gitignore
+!.golangci.yaml
+!.license-scan-overrides.jsonl
+!.license-scan-rules.json

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.25 AS builder
+FROM golang:1.26 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 # Path of our go.mod

Makefile

@@ -40,7 +40,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
 
 CONTROLLER_TOOLS_VERSION ?= v0.20.0
-GOLANGCI_LINT_VERSION ?= v2.8.0
+GOLANGCI_LINT_VERSION ?= v2.9.0
 
 .PHONY: controller-gen
 controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

Tiltfile

@@ -23,6 +23,27 @@ tilt_overrides = os.getenv('TILT_OVERRIDES_PATH')
 if tilt_overrides and os.path.exists(tilt_overrides):
     tilt_values.append(tilt_overrides)
 
+# Build a list of --set overrides from environment variables
+# Check for environment variables with CORTEX_ prefix and convert them to Helm set overrides
+# CORTEX_AAA_BBB_CCC will be converted to AAA.BBB.CCC=value
+env_set_overrides = []
+
+print("=== Scanning for CORTEX_ environment variables ===")
+for env_key in os.environ:
+    if env_key.startswith('CORTEX_'):
+        # Remove CORTEX_ prefix and convert underscores to dots
+        # CORTEX_AAA_BBB_CCC -> AAA_BBB_CCC -> AAA.BBB.CCC
+        value_key = env_key[7:].replace('_', '.').lower()
+        env_value = os.getenv(env_key)
+        override = value_key + '=' + env_value
+        env_set_overrides.append(override)
+        print("  Found: " + env_key)
+
+if len(env_set_overrides) > 0:
+    print("=== Total environment overrides: " + str(len(env_set_overrides)) + " ===")
+else:
+    print("=== No CORTEX_ environment variables found ===")
+
 load('ext://helm_resource', 'helm_resource', 'helm_repo')
 helm_repo(
     'Prometheus Community Helm Repo',
@@ -131,7 +152,7 @@ k8s_yaml(helm('./helm/bundles/cortex-crds', name='cortex-crds', set=crd_extra_va
 
 if 'nova' in ACTIVE_DEPLOYMENTS:
     print("Activating Cortex Nova bundle")
-    k8s_yaml(helm('./helm/bundles/cortex-nova', name='cortex-nova', values=tilt_values))
+    k8s_yaml(helm('./helm/bundles/cortex-nova', name='cortex-nova', values=tilt_values, set=env_set_overrides))
     k8s_resource('cortex-nova-postgresql', labels=['Cortex-Nova'], port_forwards=[
         port_forward(8000, 5432),
     ])
@@ -149,7 +170,7 @@ if 'nova' in ACTIVE_DEPLOYMENTS:
 
 if 'manila' in ACTIVE_DEPLOYMENTS:
     print("Activating Cortex Manila bundle")
-    k8s_yaml(helm('./helm/bundles/cortex-manila', name='cortex-manila', values=tilt_values))
+    k8s_yaml(helm('./helm/bundles/cortex-manila', name='cortex-manila', values=tilt_values, set=env_set_overrides))
     k8s_resource('cortex-manila-postgresql', labels=['Cortex-Manila'], port_forwards=[
         port_forward(8002, 5432),
     ])
@@ -166,7 +187,7 @@ if 'manila' in ACTIVE_DEPLOYMENTS:
     )
 
 if 'cinder' in ACTIVE_DEPLOYMENTS:
-    k8s_yaml(helm('./helm/bundles/cortex-cinder', name='cortex-cinder', values=tilt_values))
+    k8s_yaml(helm('./helm/bundles/cortex-cinder', name='cortex-cinder', values=tilt_values, set=env_set_overrides))
     k8s_resource('cortex-cinder-postgresql', labels=['Cortex-Cinder'], port_forwards=[
         port_forward(8004, 5432),
     ])
@@ -189,7 +210,7 @@ if 'ironcore' in ACTIVE_DEPLOYMENTS:
     k8s_yaml('samples/ironcore/crds/compute.ironcore.dev_machinepools.yaml')
     k8s_yaml('samples/ironcore/crds/compute.ironcore.dev_machineclasses.yaml')
     # Deploy IronCore controller
-    k8s_yaml(helm('./helm/bundles/cortex-ironcore', name='cortex-ironcore', values=tilt_values))
+    k8s_yaml(helm('./helm/bundles/cortex-ironcore', name='cortex-ironcore', values=tilt_values, set=env_set_overrides))
     k8s_resource('cortex-ironcore-controller-manager', labels=['Cortex-IronCore'])
     # Deploy resources in machines/samples
     k8s_yaml('samples/ironcore/machinepool.yaml')
@@ -198,7 +219,7 @@ if 'ironcore' in ACTIVE_DEPLOYMENTS:
 
 if 'pods' in ACTIVE_DEPLOYMENTS:
     print("Activating Cortex Pods bundle")
-    k8s_yaml(helm('./helm/bundles/cortex-pods', name='cortex-pods', values=tilt_values),)
+    k8s_yaml(helm('./helm/bundles/cortex-pods', name='cortex-pods', values=tilt_values, set=env_set_overrides))
     k8s_resource('cortex-pods-controller-manager', labels=['Cortex-Pods'])
     # Deploy example resources
     k8s_yaml('samples/pods/node.yaml')
@@ -239,4 +260,4 @@ k8s_resource('cortex-plutono', port_forwards=[
     port_forward(5000, 3000, name='plutono'),
 ], links=[
     link('http://localhost:5000/d/cortex/cortex?orgId=1', 'cortex dashboard'),
-], labels=['Monitoring'])
+], labels=['Monitoring'])

api/delegation/ironcore/messages.go → api/external/ironcore/messages.go

@@ -6,7 +6,7 @@ package ironcore
 import (
 	"log/slog"
 
-	ironcorev1alpha1 "github.com/cobaltcore-dev/cortex/api/delegation/ironcore/v1alpha1"
+	ironcorev1alpha1 "github.com/cobaltcore-dev/cortex/api/external/ironcore/v1alpha1"
 	"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"
 )
 

api/delegation/nova/messages.go → api/external/nova/messages.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"strings"
 
 	"github.com/cobaltcore-dev/cortex/internal/scheduling/lib"
 )
@@ -33,15 +34,6 @@ type ExternalSchedulerRequest struct {
 	// Whether the request is a reservation.
 	Reservation bool `json:"reservation"`
 
-	// Whether the Nova scheduling request is a rebuild request.
-	Rebuild bool `json:"rebuild"`
-	// Whether the Nova scheduling request is a resize request.
-	Resize bool `json:"resize"`
-	// Whether the Nova scheduling request is a live migration.
-	Live bool `json:"live"`
-	// Whether the affected VM is a VMware VM.
-	VMware bool `json:"vmware"`
-
 	Hosts   []ExternalSchedulerHost `json:"hosts"`
 	Weights map[string]float64      `json:"weights"`
 
@@ -82,6 +74,74 @@ func (r ExternalSchedulerRequest) FilterHosts(includedHosts map[string]float64)
 	return r
 }
 
+type HypervisorType string
+
+const (
+	// HypervisorTypeQEMU represents QEMU/KVM hypervisors.
+	HypervisorTypeQEMU HypervisorType = "qemu"
+	// HypervisorTypeCH represents Cloud-Hypervisor/KVM hypervisors.
+	HypervisorTypeCH HypervisorType = "ch"
+	// HypervisorTypeVMware represents VMware hypervisors.
+	HypervisorTypeVMware HypervisorType = "vmware"
+)
+
+// GetHypervisorType determines the hypervisor type based on the requested flavor.
+func (req ExternalSchedulerRequest) GetHypervisorType() (HypervisorType, error) {
+	extraSpecs := req.Spec.Data.Flavor.Data.ExtraSpecs
+	if val, ok := extraSpecs["capabilities:hypervisor_type"]; ok {
+		switch strings.ToLower(val) {
+		case "qemu":
+			return HypervisorTypeQEMU, nil
+		case "ch":
+			return HypervisorTypeCH, nil
+		case "vmware vcenter server":
+			return HypervisorTypeVMware, nil
+		}
+		return "", fmt.Errorf("unsupported hypervisor_type: %s", val)
+	}
+	return "", errors.New("hypervisor type not specified in flavor extra specs")
+}
+
+type RequestIntent string
+
+const (
+	// LiveMigrationIntent indicates that the request is intended for live migration.
+	LiveMigrationIntent RequestIntent = "live_migration"
+	// RebuildIntent indicates that the request is intended for rebuilding a VM.
+	RebuildIntent RequestIntent = "rebuild"
+	// ResizeIntent indicates that the request is intended for resizing a VM.
+	ResizeIntent RequestIntent = "resize"
+	// EvacuateIntent indicates that the request is intended for evacuating a VM.
+	EvacuateIntent RequestIntent = "evacuate"
+	// CreateIntent indicates that the request is intended for creating a new VM.
+	CreateIntent RequestIntent = "create"
+)
+
+// GetIntent analyzes the request spec and determines the intent of the scheduling request.
+func (req ExternalSchedulerRequest) GetIntent() (RequestIntent, error) {
+	str, err := req.Spec.Data.GetSchedulerHintStr("_nova_check_type")
+	if err != nil {
+		return "", err
+	}
+	switch str {
+	// See: https://github.com/sapcc/nova/blob/ba4813/nova/scheduler/utils.py#L1251
+	case "rebuild":
+		return RebuildIntent, nil
+	// See: https://github.com/sapcc/nova/blob/ba4813/nova/scheduler/utils.py#L1264
+	case "resize":
+		return ResizeIntent, nil
+	// See: https://github.com/sapcc/nova/blob/ba4813/nova/scheduler/utils.py#L1277C47-L1277C63
+	case "live_migrate":
+		return LiveMigrationIntent, nil
+	// Added in https://github.com/sapcc/nova/pull/594
+	// See: https://github.com/sapcc/nova/blob/c88393/nova/compute/api.py#L5770
+	case "evacuate":
+		return EvacuateIntent, nil
+	default:
+		return CreateIntent, nil
+	}
+}
+
 // Response generated by cortex for the Nova scheduler.
 // Cortex returns an ordered list of hosts that the VM should be scheduled on.
 type ExternalSchedulerResponse struct {