From bc3f5feb7eaafca4e35e18a3b0e54c96cda63963 Mon Sep 17 00:00:00 2001
From: Pete Savage <psavage@redhat.com>
Date: Tue, 17 Dec 2024 12:58:30 +0000
Subject: [PATCH] Bump go version

---
 .tekton/clowder-pull-request.yaml | 19 +++++--------------
 go.mod                            |  8 ++++----
 go.sum                            | 16 ++++++++--------
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/.tekton/clowder-pull-request.yaml b/.tekton/clowder-pull-request.yaml
index b9055a960..f8b1ff87a 100644
--- a/.tekton/clowder-pull-request.yaml
+++ b/.tekton/clowder-pull-request.yaml
@@ -308,7 +308,7 @@ spec:
             type: string
           - description: The Trusted Artifact URI pointing to the artifact with the template.
             name: TEMPLATE_ARTIFACT
-            type: string
+            type: array
         stepTemplate:
           volumeMounts:
             - mountPath: /var/workdir
@@ -324,13 +324,13 @@ spec:
             image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:81c4864dae6bb11595f657be887e205262e70086a05ed16ada827fd6391926ac
             args:
               - use
-              - $(params.TEMPLATE_ARTIFACT[0])=/var/workdir/source/manifest.yaml
-              - $(params.TEMPLATE_ARTIFACT[1])=/var/workdir/source/deploy-kustomize.yaml
+              - $(params.TEMPLATE_ARTIFACT[0])=/tmp/manifest.yaml
+              - $(params.TEMPLATE_ARTIFACT[1])=/tmp/deploy-kustomize.yaml
           - name: test-template
-            image: registry.access.redhat.com/ubi8/go-toolset:1.22.7-5.1731464728
+            image: registry.access.redhat.com/ubi8/ubi:8.10-1132.1732635159
             workingDir: /opt/app-root/src
             script: |
-              set -xe && cd /var/workdir/source && make test-template
+              set -xe && cp /var/workdir/source/* /opt/app-root/src -Rv && cp /tmp/manifest.yaml /opt/app-root/src/ && cp /tmp/deploy-kustomize.yaml /opt/app-root/src/ && cd /opt/app-root/src && make test-template
         volumes:
           # New volume to store a copy of the source code accessible only to this Task.
           - name: workdir
@@ -371,8 +371,6 @@ spec:
         # New parameter to use the Trusted Artifact from the git-clone Task.
         - name: SOURCE_ARTIFACT
           value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
-        - name: TEMPLATE_ARTIFACT
-          value: $(tasks.make-template.results.TEMPLATE_ARTIFACT)
       runAfter:
         - build-container
         - run-template-tests
@@ -392,13 +390,6 @@ spec:
             args:
               - use
               - $(params.SOURCE_ARTIFACT)=/var/workdir/source
-          - name: use-trusted-artifact-template
-            image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:81c4864dae6bb11595f657be887e205262e70086a05ed16ada827fd6391926ac
-            args:
-              - use
-              - $(params.TEMPLATE_ARTIFACT[0])=/var/workdir/source/manifest.yaml
-              - $(params.TEMPLATE_ARTIFACT[1])=/var/workdir/source/deploy.yaml
-              - $(params.TEMPLATE_ARTIFACT[2])=/var/workdir/source/deploy-mutate.yaml
           - name: e2e-tests
             image: registry.access.redhat.com/ubi8/ubi:8.10-1132.1732635159
             workingDir: /var/workdir/source
diff --git a/go.mod b/go.mod
index 4f6b0c632..bc07cf3ed 100644
--- a/go.mod
+++ b/go.mod
@@ -21,10 +21,10 @@ require (
 	github.com/prometheus/client_golang v1.19.1
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/zap v1.27.0
-	k8s.io/api v0.31.0
-	k8s.io/apiextensions-apiserver v0.31.0
-	k8s.io/apimachinery v0.31.0
-	k8s.io/client-go v0.31.0
+	k8s.io/api v0.31.4
+	k8s.io/apiextensions-apiserver v0.31.4
+	k8s.io/apimachinery v0.31.4
+	k8s.io/client-go v0.31.4
 	sigs.k8s.io/cluster-api v1.7.2
 	sigs.k8s.io/controller-runtime v0.19.1
 )
diff --git a/go.sum b/go.sum
index b16891295..4ccc02813 100644
--- a/go.sum
+++ b/go.sum
@@ -731,14 +731,14 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
 howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
-k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
-k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
-k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
-k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
-k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
-k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
-k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
-k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
+k8s.io/api v0.31.4 h1:I2QNzitPVsPeLQvexMEsj945QumYraqv9m74isPDKhM=
+k8s.io/api v0.31.4/go.mod h1:d+7vgXLvmcdT1BCo79VEgJxHHryww3V5np2OYTr6jdw=
+k8s.io/apiextensions-apiserver v0.31.4 h1:FxbqzSvy92Ca9DIs5jqot883G0Ln/PGXfm/07t39LS0=
+k8s.io/apiextensions-apiserver v0.31.4/go.mod h1:hIW9YU8UsqZqIWGG99/gsdIU0Ar45Qd3A12QOe/rvpg=
+k8s.io/apimachinery v0.31.4 h1:8xjE2C4CzhYVm9DGf60yohpNUh5AEBnPxCryPBECmlM=
+k8s.io/apimachinery v0.31.4/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
+k8s.io/client-go v0.31.4 h1:t4QEXt4jgHIkKKlx06+W3+1JOwAFU/2OPiOo7H92eRQ=
+k8s.io/client-go v0.31.4/go.mod h1:kvuMro4sFYIa8sulL5Gi5GFqUPvfH2O/dXuKstbaaeg=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=