Merge branch 'feat/federated-deployment-scheduling' into feat/datumctl-compute-plugin

Author: scotwells

.claude/settings.local.json

@@ -0,0 +1,13 @@
+{
+  "permissions": {
+    "allow": [
+      "WebSearch",
+      "WebFetch(domain:unikraft.cloud)",
+      "WebFetch(domain:unikraft.com)",
+      "WebFetch(domain:arxiv.org)",
+      "WebFetch(domain:unikraft.org)",
+      "WebFetch(domain:shixiongqi.uky.edu)",
+      "Bash(go mod tidy:*)"
+    ]
+  }
+}

api/v1alpha/instance_types.go

@@ -107,6 +107,26 @@ type SandboxContainer struct {
 	// +kubebuilder:validation:Required
 	Image string `json:"image"`
 
+	// Entrypoint array to run in the container image, overriding the image's
+	// ENTRYPOINT. Each element is a separate token, not a shell command — to run a
+	// shell command use: ["sh", "-c", "my command"].
+	//
+	// If not provided, the container image's own ENTRYPOINT is used.
+	//
+	// +kubebuilder:validation:Optional
+	Command []string `json:"command,omitempty"`
+
+	// Arguments to the entrypoint, overriding the image's CMD. Combined with
+	// Command: when Command is also set the resulting invocation is
+	// append(Command, Args...).  When only Args is set it overrides CMD while
+	// preserving the image's ENTRYPOINT.
+	//
+	// If neither Command nor Args is set, the image's own ENTRYPOINT and CMD
+	// are used unchanged.
+	//
+	// +kubebuilder:validation:Optional
+	Args []string `json:"args,omitempty"`
+
 	// List of environment variables to set in the container.
 	//
 	// +kubebuilder:validation:Optional

api/v1alpha/labels.go

@@ -15,16 +15,15 @@ const (
 
 	InstanceIndexLabel = LabelNamespace + "/instance-index"
 
-	// CityCodeLabel carries the city code (e.g. "DFW") that the Instance is
-	// scheduled to. Stamped at creation time and immutable.
+	// CityCodeLabel carries the city code of the WorkloadDeployment that owns
+	// an Instance, matching WorkloadDeploymentSpec.CityCode.
 	CityCodeLabel = LabelNamespace + "/city-code"
 
-	// WorkloadNameLabel carries the name of the Workload that owns this
-	// Instance. Stamped at creation time and immutable.
+	// WorkloadNameLabel carries the name of the Workload that an Instance
+	// ultimately belongs to, sourced from WorkloadDeploymentSpec.WorkloadRef.Name.
 	WorkloadNameLabel = LabelNamespace + "/workload-name"
 
-	// PlacementNameLabel carries the name of the placement entry within the
-	// Workload spec that produced this Instance. Stamped at creation time and
-	// immutable.
+	// PlacementNameLabel carries the placement name from the Workload that drove
+	// this Instance's deployment, sourced from WorkloadDeploymentSpec.PlacementName.
 	PlacementNameLabel = LabelNamespace + "/placement-name"
 )

api/v1alpha/workloaddeployment_types.go

@@ -2,6 +2,8 @@ package v1alpha
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	networkingv1alpha "go.datum.net/network-services-operator/api/v1alpha"
 )
 
 // WorkloadDeploymentSpec defines the desired state of WorkloadDeployment
@@ -35,6 +37,11 @@ type WorkloadDeploymentSpec struct {
 
 // WorkloadDeploymentStatus defines the observed state of WorkloadDeployment
 type WorkloadDeploymentStatus struct {
+	// The location which the deployment has been scheduled to
+	//
+	// +kubebuilder:validation:Optional
+	Location *networkingv1alpha.LocationReference `json:"location,omitempty"`
+
 	// Represents the observations of a deployment's current state.
 	// Known condition types are: "Available", "Progressing"
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
@@ -73,6 +80,8 @@ const (
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.readyReplicas`
 // +kubebuilder:printcolumn:name="Desired",type=string,JSONPath=`.status.desiredReplicas`
 // +kubebuilder:printcolumn:name="Up-to-date",type=string,JSONPath=`.status.currentReplicas`
+// +kubebuilder:printcolumn:name="Location Namespace",type=string,JSONPath=`.status.location.namespace`,priority=1
+// +kubebuilder:printcolumn:name="Location Name",type=string,JSONPath=`.status.location.name`,priority=1
 type WorkloadDeployment struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/v1alpha/zz_generated.deepcopy.go

@@ -266,6 +266,28 @@ spec:
                         description: A list of containers to run within the sandbox.
                         items:
                           properties:
+                            args:
+                              description: |-
+                                Arguments to the entrypoint, overriding the image's CMD. Combined with
+                                Command: when Command is also set the resulting invocation is
+                                append(Command, Args...).  When only Args is set it overrides CMD while
+                                preserving the image's ENTRYPOINT.
+
+                                If neither Command nor Args is set, the image's own ENTRYPOINT and CMD
+                                are used unchanged.
+                              items:
+                                type: string
+                              type: array
+                            command:
+                              description: |-
+                                Entrypoint array to run in the container image, overriding the image's
+                                ENTRYPOINT. Each element is a separate token, not a shell command — to run a
+                                shell command use: ["sh", "-c", "my command"].
+
+                                If not provided, the container image's own ENTRYPOINT is used.
+                              items:
+                                type: string
+                              type: array
                             env:
                               description: |-
                                 List of environment variables to set in the container.

config/base/crd/bases/compute.datumapis.com_instances.yaml

@@ -37,6 +37,14 @@ spec:
     - jsonPath: .status.currentReplicas
       name: Up-to-date
       type: string
+    - jsonPath: .status.location.namespace
+      name: Location Namespace
+      priority: 1
+      type: string
+    - jsonPath: .status.location.name
+      name: Location Name
+      priority: 1
+      type: string
     name: v1alpha
     schema:
       openAPIV3Schema:
@@ -367,6 +375,28 @@ spec:
                                   sandbox.
                                 items:
                                   properties:
+                                    args:
+                                      description: |-
+                                        Arguments to the entrypoint, overriding the image's CMD. Combined with
+                                        Command: when Command is also set the resulting invocation is
+                                        append(Command, Args...).  When only Args is set it overrides CMD while
+                                        preserving the image's ENTRYPOINT.
+
+                                        If neither Command nor Args is set, the image's own ENTRYPOINT and CMD
+                                        are used unchanged.
+                                      items:
+                                        type: string
+                                      type: array
+                                    command:
+                                      description: |-
+                                        Entrypoint array to run in the container image, overriding the image's
+                                        ENTRYPOINT. Each element is a separate token, not a shell command — to run a
+                                        shell command use: ["sh", "-c", "my command"].
+
+                                        If not provided, the container image's own ENTRYPOINT is used.
+                                      items:
+                                        type: string
+                                      type: array
                                     env:
                                       description: |-
                                         List of environment variables to set in the container.
@@ -1065,6 +1095,20 @@ spec:
                 description: The desired number of instances
                 format: int32
                 type: integer
+              location:
+                description: The location which the deployment has been scheduled
+                  to
+                properties:
+                  name:
+                    description: Name of a datum location
+                    type: string
+                  namespace:
+                    description: Namespace for the datum location
+                    type: string
+                required:
+                - name
+                - namespace
+                type: object
               readyReplicas:
                 description: The number of instances which are ready.
                 format: int32

config/base/crd/bases/compute.datumapis.com_workloaddeployments.yaml

@@ -385,6 +385,28 @@ spec:
                                   sandbox.
                                 items:
                                   properties:
+                                    args:
+                                      description: |-
+                                        Arguments to the entrypoint, overriding the image's CMD. Combined with
+                                        Command: when Command is also set the resulting invocation is
+                                        append(Command, Args...).  When only Args is set it overrides CMD while
+                                        preserving the image's ENTRYPOINT.
+
+                                        If neither Command nor Args is set, the image's own ENTRYPOINT and CMD
+                                        are used unchanged.
+                                      items:
+                                        type: string
+                                      type: array
+                                    command:
+                                      description: |-
+                                        Entrypoint array to run in the container image, overriding the image's
+                                        ENTRYPOINT. Each element is a separate token, not a shell command — to run a
+                                        shell command use: ["sh", "-c", "my command"].
+
+                                        If not provided, the container image's own ENTRYPOINT is used.
+                                      items:
+                                        type: string
+                                      type: array
                                     env:
                                       description: |-
                                         List of environment variables to set in the container.

config/base/crd/bases/compute.datumapis.com_workloads.yaml

@@ -0,0 +1,2 @@
+## Changelog
+* 69c7ff5388c6f6e876d279286a2a7cee563ee7c7 fix: wait for instances to be ready before reporting rollout complete