Skip to content

Commit 728e020

Browse files
committed
Pass MAVEN_PASSWORD as env var via taskspec
1 parent cdd75ae commit 728e020

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

pkg/reconciler/dependencybuild/dependencybuild.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,18 +624,31 @@ func (r *ReconcileDependencyBuild) handleStateBuilding(ctx context.Context, db *
624624
}
625625
}
626626

627+
trueBool := true
628+
pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
629+
PipelineTaskName: DeployTaskName,
630+
PodTemplate: &pod.Template{
631+
Env: []v1.EnvVar{
632+
{
633+
Name: "MAVEN_PASSWORD",
634+
ValueFrom: &v1.EnvVarSource{SecretKeyRef: &v1.SecretKeySelector{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.MavenSecretName}, Key: v1alpha1.MavenSecretKey, Optional: &trueBool}},
635+
},
636+
},
637+
},
638+
}}
639+
627640
if jbsConfig.Annotations != nil && jbsConfig.Annotations[jbsconfig.CITests] == "true" {
628641
log.Info(fmt.Sprintf("Configuring resources for %#v", BuildTaskName))
629642
podMemR, _ := resource.ParseQuantity("1792Mi")
630643
podMemL, _ := resource.ParseQuantity("3584Mi")
631644
podCPU, _ := resource.ParseQuantity("500m")
632-
pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
645+
pr.Spec.TaskRunSpecs = append(pr.Spec.TaskRunSpecs, tektonpipeline.PipelineTaskRunSpec{
633646
PipelineTaskName: BuildTaskName,
634647
ComputeResources: &v1.ResourceRequirements{
635648
Requests: v1.ResourceList{"memory": podMemR, "cpu": podCPU},
636649
Limits: v1.ResourceList{"memory": podMemL, "cpu": podCPU},
637650
},
638-
}}
651+
})
639652
}
640653
// TODO: DisableTLS defaults to true. Further the tls workspace has been removed from the build pipeline so an alternate method would be needed.
641654
//if !jbsConfig.Spec.CacheSettings.DisableTLS {

0 commit comments

Comments
 (0)