Default GangNodeUniformityLabelAnnotation at the correct level. (#120) (

#3529) Co-authored-by: Christopher Martin <Chris.Martin@gresearch.co.uk>
armadaproject · Apr 23, 2024 · 4f6df3d · 4f6df3d
1 parent d22fc41
commit 4f6df3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/internal/armada/submit/conversion/post_process.go b/internal/armada/submit/conversion/post_process.go
@@ -155,7 +155,7 @@ func defaultTerminationGracePeriod(spec *v1.PodSpec, config configuration.Submis
 
 // Default's the job's GangNodeUniformityLabelAnnotation for gang jobs that do not define one.
 func defaultGangNodeUniformityLabel(msg *armadaevents.SubmitJob, config configuration.SubmissionConfig) {
- annotations := msg.MainObject.GetObjectMeta().GetAnnotations()
+ annotations := msg.GetObjectMeta().GetAnnotations()
  if annotations == nil {
  return
  }

diff --git a/internal/armada/submit/conversion/post_process_test.go b/internal/armada/submit/conversion/post_process_test.go
@@ -587,10 +587,8 @@ func TestDefaultTerminationGracePeriod(t *testing.T) {
 
 func submitMsgFromAnnotations(annotations map[string]string) *armadaevents.SubmitJob {
  return &armadaevents.SubmitJob{
- MainObject: &armadaevents.KubernetesMainObject{
- ObjectMeta: &armadaevents.ObjectMeta{
- Annotations: annotations,
- },
+ ObjectMeta: &armadaevents.ObjectMeta{
+ Annotations: annotations,
  },
  }
 }