Allowed volume expansion for build pod

Author: vishal24367

.tool-versions

@@ -0,0 +1 @@
+golang 1.24.0

pkg/apis/build/v1alpha2/build_pod.go

@@ -272,7 +272,7 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 			layersMount,
 			workspaceVolume,
 			homeMount,
-		}),
+		}, b.Spec.VolumeMounts),
 		Env: []corev1.EnvVar{
 			homeEnv,
 			platformApiVersionEnvVar,
@@ -295,7 +295,7 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 			layersMount,
 			platformMount,
 			workspaceVolume,
-		}, bindingVolumeMounts),
+		}, bindingVolumeMounts, b.Spec.VolumeMounts),
 		ImagePullPolicy: corev1.PullIfNotPresent,
 		Env: []corev1.EnvVar{
 			platformApiVersionEnvVar,
@@ -355,6 +355,7 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 								reportMount,
 								notaryV1Mount,
 							},
+							b.Spec.VolumeMounts,
 						),
 						ImagePullPolicy: corev1.PullIfNotPresent,
 						SecurityContext: containerSecurityContext(),
@@ -425,6 +426,7 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 								homeMount,
 								projectMetadataMount,
 							},
+							b.Spec.VolumeMounts,
 						),
 					},
 				)
@@ -446,7 +448,7 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 						VolumeMounts: volumeMounts([]corev1.VolumeMount{
 							layersMount,
 							homeMount,
-						}, cacheVolumes),
+						}, cacheVolumes, b.Spec.VolumeMounts),
 						Env: []corev1.EnvVar{
 							homeEnv,
 							platformApiVersionEnvVar,
@@ -471,7 +473,7 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 							layersMount,
 							platformMount,
 							workspaceVolume,
-						}, bindingVolumeMounts),
+						}, bindingVolumeMounts, b.Spec.VolumeMounts),
 						ImagePullPolicy: corev1.PullIfNotPresent,
 						Env: []corev1.EnvVar{
 							platformApiVersionEnvVar,
@@ -508,7 +510,7 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 							workspaceVolume,
 							homeMount,
 							reportMount,
-						}, cacheVolumes),
+						}, cacheVolumes, b.Spec.VolumeMounts),
 						Env: envs(
 							[]corev1.EnvVar{
 								homeEnv,
@@ -581,7 +583,10 @@ func (b *Build) BuildPod(images BuildPodImages, buildContext BuildContext) (*cor
 					b.Spec.Source.Source().ImagePullSecretsVolume(registrySourcePullSecretsVolumeName),
 					b.notarySecretVolume(),
 				},
-				bindingVolumes),
+				b.Spec.Volumes,
+				bindingVolumes,
+			),
+
 			ImagePullSecrets: b.Spec.Builder.ImagePullSecrets,
 		},
 	}
@@ -647,15 +652,19 @@ func (b *Build) useStandardContainers(buildWaiterImage string, pod *corev1.Pod)
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			WorkingDir:      "/workspace",
 			VolumeMounts: volumeMounts(
-				[]corev1.VolumeMount{
-					buildWaitMount,
-				},
+				append(
+					[]corev1.VolumeMount{buildWaitMount},
+					b.Spec.VolumeMounts...,
+				),
 			),
 		},
 	}
+
 	pod.Spec.Containers = append(containers, pod.Spec.Containers...)
 
 	for i := 0; i < len(pod.Spec.Containers); i++ {
+		pod.Spec.Containers[i].VolumeMounts = append(pod.Spec.Containers[i].VolumeMounts, b.Spec.VolumeMounts...)
+
 		if i == 0 {
 			pod.Spec.Containers[i].VolumeMounts = append(pod.Spec.Containers[i].VolumeMounts, downwardMount)
 			pod.Spec.Containers[i] = setUpBuildWaiter(pod.Spec.Containers[i], "/downward/sidecars-ready")
@@ -689,6 +698,8 @@ func (b *Build) useStandardContainers(buildWaiterImage string, pod *corev1.Pod)
 		},
 	)
 
+	pod.Spec.Volumes = append(pod.Spec.Volumes, b.Spec.Volumes...)
+
 	delete(pod.Annotations, IstioInject)
 	return pod
 }
@@ -847,6 +858,7 @@ func (b *Build) rebasePod(buildContext BuildContext, images BuildPodImages) (*co
 						[]corev1.VolumeMount{
 							reportMount,
 						},
+						b.Spec.VolumeMounts,
 					),
 				},
 			},

pkg/apis/build/v1alpha2/build_types.go

@@ -78,6 +78,8 @@ type BuildSpec struct {
 	SchedulerName     string              `json:"schedulerName,omitempty"`
 	PriorityClassName string              `json:"priorityClassName,omitempty"`
 	CreationTime      string              `json:"creationTime,omitempty"`
+	VolumeMounts 	  []corev1.VolumeMount `json:"volumeMounts,omitempty"`
+    Volumes           []corev1.Volume      `json:"volumes,omitempty"`
 }
 
 func (bs *BuildSpec) RegistryCacheTag() string {

pkg/apis/build/v1alpha2/image_builds.go

@@ -82,6 +82,8 @@ func (im *Image) Build(sourceResolver *SourceResolver, builder BuilderResource,
 			PriorityClassName:     priorityClass,
 			ActiveDeadlineSeconds: im.BuildTimeout(),
 			CreationTime:          im.Spec.creationTime(),
+			Volumes:               im.Volumes(),
+			VolumeMounts:          im.VolumeMounts(),
 		},
 	}
 }
@@ -304,3 +306,17 @@ func (is *ImageSpec) creationTime() string {
 
 	return ""
 }
+
+func (im *Image) Volumes() []corev1.Volume {
+	if im.Spec.Build == nil {
+		return nil
+	}
+	return im.Spec.Build.Volumes
+}
+
+func (im *Image) VolumeMounts() []corev1.VolumeMount {
+	if im.Spec.Build == nil {
+		return nil
+	}
+	return im.Spec.Build.VolumeMounts
+}

pkg/apis/build/v1alpha2/image_types.go

@@ -79,6 +79,8 @@ type ImageBuild struct {
 	SchedulerName        string              `json:"schedulerName,omitempty"`
 	BuildTimeout         *int64              `json:"buildTimeout,omitempty"`
 	CreationTime         string              `json:"creationTime,omitempty"`
+	VolumeMounts  		 []corev1.VolumeMount 	`json:"volumeMounts,omitempty"`
+    Volumes       		 []corev1.Volume      	`json:"volumes,omitempty"`
 }
 
 // +k8s:openapi-gen=true

pkg/git/fetch.go

@@ -62,7 +62,6 @@ func (f Fetcher) Fetch(dir, gitURL, gitRevision, metadataDir string) error {
 	}
 
 	err = remote.Fetch(&gogit.FetchOptions{
-		Depth: 1,
 		RefSpecs: []config.RefSpec{config.RefSpec(resolvedSourceConfig.Git.Revision + ":" + resolvedSourceConfig.Git.Revision)},
 		Auth:     auth,
 		Depth:    1,