Skip to content

Commit 621bcee

Browse files
authored
job parallelism is zero unless in applying list (#145)
Attempting to address #134 Signed-off-by: Jacob Blain Christen <[email protected]>
1 parent ec85e0f commit 621bcee

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

pkg/upgrade/job/job.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package job
22

33
import (
44
"os"
5+
"sort"
56
"strconv"
67

78
"github.com/rancher/system-upgrade-controller/pkg/apis/condition"
@@ -94,6 +95,7 @@ var (
9495
func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *batchv1.Job {
9596
hostPathDirectory := corev1.HostPathDirectory
9697
labelPlanName := upgradeapi.LabelPlanName(plan.Name)
98+
nodeHostname := upgradenode.Hostname(node)
9799
job := &batchv1.Job{
98100
ObjectMeta: metav1.ObjectMeta{
99101
Name: name.SafeConcatName("apply", plan.Name, "on", node.Name, "with", plan.Status.LatestHash),
@@ -136,7 +138,7 @@ func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *bat
136138
Key: corev1.LabelHostname,
137139
Operator: corev1.NodeSelectorOpIn,
138140
Values: []string{
139-
upgradenode.Hostname(node),
141+
nodeHostname,
140142
},
141143
}},
142144
}},
@@ -184,8 +186,16 @@ func New(plan *upgradeapiv1.Plan, node *corev1.Node, controllerName string) *bat
184186
}},
185187
},
186188
},
189+
Completions: new(int32),
190+
Parallelism: new(int32),
187191
},
188192
}
193+
194+
*job.Spec.Completions = 1
195+
if i := sort.SearchStrings(plan.Status.Applying, nodeHostname); i < len(plan.Status.Applying) && plan.Status.Applying[i] == nodeHostname {
196+
*job.Spec.Parallelism = 1
197+
}
198+
189199
podTemplate := &job.Spec.Template
190200
// setup secrets volumes
191201
for _, secret := range plan.Spec.Secrets {

0 commit comments

Comments
 (0)