Merge pull request #1143 from equinor/master

Set arm platform for acr build job (#1142)
equinor · Jul 22, 2024 · b68c20a · b68c20a
2 parents b361e07 + a6cb59b
commit b68c20a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/charts/radix-operator/Chart.yaml b/charts/radix-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.37.2
-appVersion: 1.57.1
+version: 1.37.3
+appVersion: 1.57.2
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

diff --git a/pipeline-runner/steps/build/build_acr.go b/pipeline-runner/steps/build/build_acr.go
@@ -55,7 +55,7 @@ func (step *BuildStepImplementation) buildContainerImageBuildingJobsForACRTasks(
 
 	log.Ctx(ctx).Debug().Msg("build a build-job")
 	hash := strings.ToLower(utils.RandStringStrSeed(5, pipelineInfo.PipelineArguments.JobName))
-	job, err := buildContainerImageBuildingJob(ctx, rr, pipelineInfo, buildSecrets, hash, &radixv1.Runtime{Architecture: radixv1.RuntimeArchitectureAmd64}, buildComponentImages...)
+	job, err := buildContainerImageBuildingJob(ctx, rr, pipelineInfo, buildSecrets, hash, &radixv1.Runtime{Architecture: radixv1.RuntimeArchitectureArm64}, buildComponentImages...)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pipeline-runner/steps/build/build_test.go b/pipeline-runner/steps/build/build_test.go
@@ -189,7 +189,7 @@ func (s *buildTestSuite) Test_BuildDeploy_JobSpecAndDeploymentConsistent() {
 	expectedAffinity := &corev1.Affinity{NodeAffinity: &corev1.NodeAffinity{RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{NodeSelectorTerms: []corev1.NodeSelectorTerm{{MatchExpressions: []corev1.NodeSelectorRequirement{
 		{Key: kube.RadixJobNodeLabel, Operator: corev1.NodeSelectorOpExists},
 		{Key: corev1.LabelOSStable, Operator: corev1.NodeSelectorOpIn, Values: []string{defaults.DefaultNodeSelectorOS}},
-		{Key: corev1.LabelArchStable, Operator: corev1.NodeSelectorOpIn, Values: []string{defaults.DefaultNodeSelectorArchitecture}},
+		{Key: corev1.LabelArchStable, Operator: corev1.NodeSelectorOpIn, Values: []string{string(radixv1.RuntimeArchitectureArm64)}},
 	}}}}}}
 	s.Equal(expectedAffinity, job.Spec.Template.Spec.Affinity)