Use a computeresources for the pipeline.

Author: rnc

deploy/tasks/buildah-oci-ta.yaml

@@ -72,10 +72,6 @@ spec:
         hours, days, and weeks, respectively.
       type: string
       default: ""
-    - name: CACHE_URL
-      type: string
-      description: For JBS, URL of the cache.
-      default: ""
     - name: PREFETCH_INPUT
       description: In case it is not empty, the prefetched content should
         be made available to the build.
@@ -245,8 +241,6 @@ spec:
       env:
         - name: COMMIT_SHA
           value: $(params.COMMIT_SHA)
-        - name: CACHE_URL
-          value: $(params.CACHE_URL)
       script: |
         #!/bin/bash
         set -e
@@ -398,11 +392,6 @@ spec:
           done < <(find $ADDITIONAL_SECRET_TMP -maxdepth 1 -type f -exec basename {} \;)
         fi
 
-        # TODO: Rename to JBS_CACHE_URL?
-        if [ -n "$CACHE_URL" ]; then
-          BUILDAH_ARGS+=("--build-arg=CACHE_URL=$CACHE_URL")
-        fi
-
         unshare -Uf $UNSHARE_ARGS --keep-caps -r --map-users 1,1,65536 --map-groups 1,1,65536 -w ${SOURCE_CODE_DIR}/$CONTEXT -- buildah build \
           $VOLUME_MOUNTS \
           "${BUILDAH_ARGS[@]}" \

pkg/reconciler/dependencybuild/buildrecipeyaml.go

@@ -29,7 +29,7 @@ const (
 	PreBuildTaskName  = "pre-build"
 	BuildTaskName     = "build"
 	PostBuildTaskName = "post-build"
-	TagTaskName       = "tag"
+	DeployTaskName    = "deploy"
 )
 
 //go:embed scripts/maven-build.sh
@@ -81,7 +81,7 @@ func createDeployPipelineSpec(jbsConfig *v1alpha1.JBSConfig, buildRequestProcess
 		Params: []tektonpipeline.ParamSpec{{Name: PipelineResultImageDigest, Type: tektonpipeline.ParamTypeString}},
 		Tasks: []tektonpipeline.PipelineTask{
 			{
-				Name: TagTaskName,
+				Name: DeployTaskName,
 				TaskRef: &tektonpipeline.TaskRef{
 					// Can't specify name and resolver as they clash.
 					ResolverRef: resolver,
@@ -527,13 +527,13 @@ func createPipelineSpec(log logr.Logger, tool string, commitTime int64, jbsConfi
 						StringVal: tlsVerify,
 					},
 				},
-				//{
-				//	Name: "BUILD_ARGS",
-				//	Value: tektonpipeline.ParamValue{
-				//		Type:     tektonpipeline.ParamTypeArray,
-				//		ArrayVal: []string{"CACHE_URL=" + cacheUrl},
-				//	},
-				//},
+				{
+					Name: "BUILD_ARGS",
+					Value: tektonpipeline.ParamValue{
+						Type:     tektonpipeline.ParamTypeArray,
+						ArrayVal: []string{"CACHE_URL=" + cacheUrl},
+					},
+				},
 			},
 
 			// TODO: ### How to pass build-settings/tls information to buildah task?

pkg/reconciler/dependencybuild/dependencybuild.go

@@ -636,6 +636,7 @@ func (r *ReconcileDependencyBuild) handleStateBuilding(ctx context.Context, db *
 			},
 		}},
 	}
+	// TODO: ### Enclose this within an annotation to denote test CI system in use?
 	pr.Spec.TaskRunTemplate = tektonpipeline.PipelineTaskRunTemplate{
 		PodTemplate: &pod.Template{
 			Env: []v1.EnvVar{
@@ -646,6 +647,17 @@ func (r *ReconcileDependencyBuild) handleStateBuilding(ctx context.Context, db *
 			},
 		},
 	}
+	// TODO: ### Enclose this within an annotation to denote test CI system in use?
+	podMemR, _ := resource.ParseQuantity("1792Mi")
+	podMemL, _ := resource.ParseQuantity("3584Mi")
+	podCPU, _ := resource.ParseQuantity("500m")
+	pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
+		PipelineTaskName: BuildTaskName,
+		ComputeResources: &v1.ResourceRequirements{
+			Requests: v1.ResourceList{"memory": podMemR, "cpu": podCPU},
+			Limits:   v1.ResourceList{"memory": podMemL, "cpu": podCPU},
+		},
+	}}
 
 	if !jbsConfig.Spec.CacheSettings.DisableTLS {
 		pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: "tls", ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: v1alpha1.TlsConfigMapName}}})
@@ -1438,6 +1450,7 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
 		pr.Spec.Workspaces = append(pr.Spec.Workspaces, tektonpipeline.WorkspaceBinding{Name: "tls", EmptyDir: &v1.EmptyDirVolumeSource{}})
 	}
 	pr.Spec.Timeouts = &tektonpipeline.TimeoutFields{Pipeline: &v12.Duration{Duration: time.Hour * v1alpha1.DefaultTimeout}}
+	// TODO: ### Enclose this within an annotation to denote test CI system in use? Could inline orasOptions then as well?
 	pr.Spec.TaskRunTemplate = tektonpipeline.PipelineTaskRunTemplate{
 		PodTemplate: &pod.Template{
 			Env: []v1.EnvVar{
@@ -1448,6 +1461,16 @@ func (r *ReconcileDependencyBuild) handleStateDeploying(ctx context.Context, db
 			},
 		},
 	}
+	// TODO: ### Enclose this within an annotation to denote test CI system in use?
+	podMem, _ := resource.ParseQuantity("1024Mi")
+	podCPU, _ := resource.ParseQuantity("250m")
+	pr.Spec.TaskRunSpecs = []tektonpipeline.PipelineTaskRunSpec{{
+		PipelineTaskName: DeployTaskName,
+		ComputeResources: &v1.ResourceRequirements{
+			Requests: v1.ResourceList{"memory": podMem, "cpu": podCPU},
+			Limits:   v1.ResourceList{"memory": podMem, "cpu": podCPU},
+		},
+	}}
 
 	if err := controllerutil.SetOwnerReference(db, &pr, r.scheme); err != nil {
 		return reconcile.Result{}, err

pkg/reconciler/jbsconfig/jbsconfig.go

@@ -35,7 +35,7 @@ import (
 
 const (
 	TlsServiceName            = v1alpha1.CacheDeploymentName + "-tls"
-	TestRegistry              = "jvmbuildservice.io/test-registry"
+	TestRegistry              = "jvmbuildservice.io/test-registry" // Denote using an insecure registry in GitHub Actions
 	RetryTimeAnnotations      = "jvmbuildservice.io/retry-time"
 	RetryTimestampAnnotations = "jvmbuildservice.io/retry-timestamp"
 )