Adjust container count for lack of system container

buildkite · Mar 14, 2024 · 44c8310 · 44c8310
1 parent ad9a597
commit 44c8310
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/internal/controller/scheduler/scheduler.go b/internal/controller/scheduler/scheduler.go
@@ -231,7 +231,11 @@ func (w *jobWrapper) Build(skipCheckout bool) (*batchv1.Job, error) {
  volumeMounts := []corev1.VolumeMount{{Name: "workspace", MountPath: "/workspace"}}
  volumeMounts = append(volumeMounts, w.k8sPlugin.ExtraVolumeMounts...)
 
- const systemContainers = 1
+ systemContainerCount := 0
+ if !skipCheckout {
+ systemContainerCount = 1
+ }
+
  ttl := int32(w.cfg.JobTTL.Seconds())
  kjob.Spec.TTLSecondsAfterFinished = &ttl
 
@@ -261,7 +265,7 @@ func (w *jobWrapper) Build(skipCheckout bool) (*batchv1.Job, error) {
  },
  corev1.EnvVar{
  Name: "BUILDKITE_CONTAINER_ID",
- Value: strconv.Itoa(i + systemContainers),
+ Value: strconv.Itoa(i + systemContainerCount),
  },
  corev1.EnvVar{
  Name: "BUILDKITE_PLUGINS_PATH",
@@ -294,7 +298,7 @@ func (w *jobWrapper) Build(skipCheckout bool) (*batchv1.Job, error) {
  podSpec.Containers[i] = c
  }
 
- containerCount := len(podSpec.Containers) + systemContainers
+ containerCount := len(podSpec.Containers) + systemContainerCount
 
  for i, c := range w.k8sPlugin.Sidecars {
  if c.Name == "" {