add extraEnv toleration affinity

bearslyricattack · Sep 2, 2024 · dd165fc · dd165fc
1 parent 69ba3fd
commit dd165fc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/controllers/devbox/api/v1alpha1/devbox_types.go b/controllers/devbox/api/v1alpha1/devbox_types.go
@@ -64,6 +64,18 @@ type NetworkSpec struct {
 	ExtraPorts []corev1.ContainerPort `json:"extraPorts"`
 }
 
+type RunSpec struct {
+	// +kubebuilder:validation:Optional
+	Env []corev1.EnvVar `json:"env"`
+}
+
+type ScheduleSpec struct {
+	// +kubebuilder:validation:Optional
+	Tolerations []corev1.Toleration
+	// +kubebuilder:validation:Optional
+	Affinity corev1.Affinity
+}
+
 // DevboxSpec defines the desired state of Devbox
 type DevboxSpec struct {
 	// +kubebuilder:validation:Required
@@ -78,6 +90,10 @@ type DevboxSpec struct {
 	RuntimeRef RuntimeRef `json:"runtimeRef"`
 	// +kubebuilder:validation:Required
 	NetworkSpec NetworkSpec `json:"network"`
+	// +kubebuilder:validation:Optional
+	RunSpec RunSpec `json:"run"`
+	// +kubebuilder:validation:Optional
+	ScheduleSpec ScheduleSpec `json:"schedule"`
 }
 
 type NetworkStatus struct {

diff --git a/controllers/devbox/internal/controller/devbox_controller.go b/controllers/devbox/internal/controller/devbox_controller.go
@@ -384,7 +384,7 @@ func (r *DevboxReconciler) generateDevboxPod(ctx context.Context, devbox *devbox
 			},
 		},
 	}
-
+	envs = append(envs, devbox.Spec.RunSpec.Env...)
 	//get image name
 	imageName, err := r.getLastSuccessCommitImageName(ctx, devbox)
 	if err != nil {
@@ -445,6 +445,8 @@ func (r *DevboxReconciler) generateDevboxPod(ctx context.Context, devbox *devbox
 			Volumes:                       volume,
 			TerminationGracePeriodSeconds: ptr.To(int64(terminationGracePeriodSeconds)),
 			AutomountServiceAccountToken:  ptr.To(automountServiceAccountToken),
+			Tolerations:                   devbox.Spec.ScheduleSpec.Tolerations,
+			Affinity:                      &devbox.Spec.ScheduleSpec.Affinity,
 		},
 	}
 	if err = controllerutil.SetControllerReference(devbox, expectPod, r.Scheme); err != nil {