Merge pull request #172 from SaschaSchwarze0/sascha-updates

Update dependencies and other things

Author: openshift-merge-bot[bot]

.github/actions/setup/action.yaml

@@ -5,7 +5,7 @@ inputs:
   go-version:
     description: "The Go version to download (if necessary) and use. Supports semver spec and ranges. Be sure to enclose this option in single quotation marks."
     required: false
-    default: "1.22.x"
+    default: "1.24.x"
 runs:
   using: composite
   steps:

.github/workflows/release.yaml

@@ -27,14 +27,14 @@ jobs:
       TAG: ${{ github.event.inputs.release }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         ref: ${{ github.event.inputs.git-ref }}
     - uses: ./.github/actions/setup
     - uses: sigstore/cosign-installer@v3
-    - uses: azure/setup-helm@v3.5
+    - uses: azure/setup-helm@v4
       with:
-        version: v3.8.0
+        version: v3.19.2
 
     - name: Build Release Changelog
       env:

.github/workflows/security.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - uses: ./.github/actions/setup
       - name: Run gosec
         uses: securego/gosec@master

.github/workflows/test.yaml

@@ -16,7 +16,7 @@ jobs:
     name: unit
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - uses: ./.github/actions/setup
       - name: test-unit
         run: make test-unit
@@ -25,7 +25,7 @@ jobs:
     name: integration
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - uses: ./.github/actions/setup
       - name: test-integration
         run: make test-integration
@@ -35,7 +35,7 @@ jobs:
   #   runs-on: ubuntu-latest
   #   steps:
   #     - name: Checkout Code
-  #       uses: actions/checkout@v4
+  #       uses: actions/checkout@v6
   #     - uses: ./.github/actions/setup
   #     - uses: ./.github/actions/shipwright
 

.github/workflows/verify.yaml

@@ -19,7 +19,7 @@ jobs:
     name: generate
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - uses: ./.github/actions/setup
 
@@ -32,8 +32,8 @@ jobs:
     name: golangci-lint
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: golangci-lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v9
       with:
         args: --timeout=10m

.golangci.yaml

@@ -1,12 +1,32 @@
+version: "2"
 linters:
   enable:
+    - contextcheck
     - errcheck
-    - gosimple
+    - goconst
+    - gosec
     - govet
     - ineffassign
+    - misspell
     - staticcheck
     - unused
-    - contextcheck
-    - goconst
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
     - gofmt
-    - misspell
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

controllers/customrun_controller.go

@@ -45,7 +45,7 @@ type CustomRunReconciler struct {
 // generateBuildRun generates a BuildRun instance owned by the informed Tekton CustomRun object, the
 // BuildRun name is randomly generated using the Run's name as base.
 func (r *CustomRunReconciler) generateBuildRun(
-	ctx context.Context,
+	logger logr.Logger,
 	customRun *tektonapibeta.CustomRun,
 ) (*buildapi.BuildRun, error) {
 	br := buildapi.BuildRun{
@@ -64,6 +64,35 @@ func (r *CustomRunReconciler) generateBuildRun(
 			Timeout:     customRun.Spec.Timeout,
 		},
 	}
+
+	for _, workspaceBinding := range customRun.Spec.Workspaces {
+		if workspaceBinding.Name == "shp-source" {
+			br.Annotations = map[string]string{
+				"source-workspace": "shp-source",
+			}
+
+			// TODO use subPath as context directory
+		} else {
+			if workspaceBinding.SubPath != "" {
+				// TODO should we fail ?
+				logger.Info("SubPath is ignored", "namespace", customRun.Namespace, "name", customRun.Name, "workspace", workspaceBinding.SubPath)
+			}
+
+			br.Spec.Volumes = append(br.Spec.Volumes, buildapi.BuildVolume{
+				Name: workspaceBinding.Name,
+				VolumeSource: corev1.VolumeSource{
+					ConfigMap:             workspaceBinding.ConfigMap,
+					CSI:                   workspaceBinding.CSI,
+					EmptyDir:              workspaceBinding.EmptyDir,
+					PersistentVolumeClaim: workspaceBinding.PersistentVolumeClaim,
+					Projected:             workspaceBinding.Projected,
+					Secret:                workspaceBinding.Secret,
+				},
+			})
+		}
+
+	}
+
 	err := controllerutil.SetControllerReference(customRun, &br, r.Scheme)
 	if err != nil {
 		return nil, err
@@ -126,8 +155,8 @@ func (r *CustomRunReconciler) Reconcile(
 ) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 
-	var customRun tektonapibeta.CustomRun
-	err := r.Get(ctx, req.NamespacedName, &customRun)
+	customRun := &tektonapibeta.CustomRun{}
+	err := r.Get(ctx, req.NamespacedName, customRun)
 	if err != nil {
 		if !errors.IsNotFound(err) {
 			logger.Error(err, "Unable to fetch Run")
@@ -162,7 +191,7 @@ func (r *CustomRunReconciler) Reconcile(
 			return Done()
 		}
 
-		if br, err = r.generateBuildRun(ctx, &customRun); err != nil {
+		if br, err = r.generateBuildRun(logger, customRun); err != nil {
 			logger.V(0).Error(err, "Issuing BuildRun returned error")
 			return RequeueOnError(err)
 		}
@@ -178,13 +207,13 @@ func (r *CustomRunReconciler) Reconcile(
 		customRun.Status.StartTime = &now
 
 		// storing the ExtraFields on the Tekton Run instance status
-		if err = r.Client.Status().Patch(ctx, &customRun, client.MergeFrom(originalCustomRun)); err != nil {
+		if err = r.Client.Status().Patch(ctx, customRun, client.MergeFrom(originalCustomRun)); err != nil {
 			logger.V(0).Error(err, "trying to patch Tekton CustomRun status")
 			return RequeueOnError(err)
 		}
 		logger.V(0).Info("Tekton CustomRun Status ExtraFields updated with BuildRun coordinates")
 
-		if err = r.Client.Create(ctx, br); err != nil {
+		if err = r.Create(ctx, br); err != nil {
 			logger.V(0).Error(err, "Trying to create a new BuildRun instance")
 			return RequeueOnError(err)
 		}
@@ -194,7 +223,7 @@ func (r *CustomRunReconciler) Reconcile(
 		logger.V(0).Info("Retrieving BuildRun instance...")
 		// when the meta-information is populated, we need to extract the BuildRun name and retrieve
 		// the object
-		if err = r.Client.Get(ctx, extraFields.GetNamespacedName(), br); err != nil {
+		if err = r.Get(ctx, extraFields.GetNamespacedName(), br); err != nil {
 			logger.V(0).Error(err, "Trying to retrieve BuildRun instance")
 			return RequeueOnError(err)
 		}
@@ -204,16 +233,16 @@ func (r *CustomRunReconciler) Reconcile(
 
 			originalBr := br.DeepCopy()
 			br.Spec.State = buildapi.BuildRunRequestedStatePtr(buildapi.BuildRunStateCancel)
-			if err = r.Client.Patch(ctx, br, client.MergeFrom(originalBr)); err != nil {
+			if err = r.Patch(ctx, br, client.MergeFrom(originalBr)); err != nil {
 				logger.V(0).Error(err, "trying to patch BuildRun with cancellation state")
 				return RequeueOnError(err)
 			}
 		} else {
 			// reflecting BuildRuns' status conditions on the Tekton Run owner instance
-			r.reflectBuildRunStatusOnTektonCustomRun(logger, &customRun, br)
+			r.reflectBuildRunStatusOnTektonCustomRun(logger, customRun, br)
 
 			logger.V(0).Info("Updating Tekton CustomRun instance status...")
-			if err = r.Client.Status().Patch(ctx, &customRun, client.MergeFrom(originalCustomRun)); err != nil {
+			if err = r.Client.Status().Patch(ctx, customRun, client.MergeFrom(originalCustomRun)); err != nil {
 				logger.V(0).Error(err, "trying to patch Tekton CustomRun status")
 				return RequeueOnError(err)
 			}

controllers/inventory_controller.go

@@ -41,7 +41,7 @@ func (r *InventoryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		return RequeueOnError(client.IgnoreNotFound(err))
 	}
 
-	if b.ObjectMeta.DeletionTimestamp.IsZero() {
+	if b.DeletionTimestamp.IsZero() {
 		logger.V(0).Info("Adding Build on the Inventory")
 		r.buildInventory.Add(&b)
 	} else {

controllers/pipelinerun_controller.go

@@ -65,7 +65,7 @@ func (r *PipelineRunReconciler) createBuildRun(
 			},
 		},
 	}
-	if err := r.Client.Create(ctx, &br); err != nil {
+	if err := r.Create(ctx, &br); err != nil {
 		return "", err
 	}
 	return br.GetName(), nil
@@ -111,7 +111,7 @@ func (r *PipelineRunReconciler) Reconcile(
 
 	// creating a objectRef based on the informed PipelineRun, the instance is informed to the
 	// inventory query interface to list Shipwright Builds that should be triggered
-	objectRef, err := filter.PipelineRunToObjectRef(ctx, r.Clock.Now(), &pipelineRun)
+	objectRef, err := filter.PipelineRunToObjectRef(ctx, r.Now(), &pipelineRun)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -183,7 +183,7 @@ func (r *PipelineRunReconciler) Reconcile(
 	filter.PipelineRunAnnotateName(&pipelineRun)
 
 	// patching the PipelineRun to reflect labels and annotations needed on the object
-	if err = r.Client.Patch(ctx, &pipelineRun, client.MergeFrom(originalPipelineRun)); err != nil {
+	if err = r.Patch(ctx, &pipelineRun, client.MergeFrom(originalPipelineRun)); err != nil {
 		logger.V(0).Error(err, "trying to update PipelineRun metadata")
 		return RequeueOnError(err)
 	}

controllers/result.go

@@ -13,9 +13,5 @@ func Done() (ctrl.Result, error) {
 }
 
 func RequeueOnError(err error) (ctrl.Result, error) {
-	requeue := true
-	if err == nil {
-		requeue = false
-	}
-	return ctrl.Result{Requeue: requeue}, err
+	return ctrl.Result{Requeue: err != nil}, err
 }