From 7c7eed3fde9625746308c8e14ad54b1b1121994c Mon Sep 17 00:00:00 2001
From: vinamra28 <jvinamra776@gmail.com>
Date: Sun, 17 Sep 2023 15:59:53 +0530
Subject: [PATCH] Bump goreleaser version and optimize get-version

With go version v1.20.7, goreleaser version also need to be upgraded to
v1.15.2.

Also in get-version task we were running two steps and both the
steps were using same image, hence merged both into a single step. Also
the task was using goreleaser image which is more than 300M in size,
instead using alpine/git which is ~21M

Also use tkn hub install to install tasks from catalog so that we always
use the latest one available

Signed-off-by: vinamra28 <jvinamra776@gmail.com>
---
 tekton/get-version.yaml     | 16 ++++++----------
 tekton/release-pipeline.yml |  2 +-
 tekton/release.sh           |  9 +++++----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/tekton/get-version.yaml b/tekton/get-version.yaml
index e374062220..57d24f0d3f 100644
--- a/tekton/get-version.yaml
+++ b/tekton/get-version.yaml
@@ -10,19 +10,15 @@ spec:
     - name: package
       description: base package where the source code lies
   steps:
-    - name: pull
-      image: goreleaser/goreleaser
+    - name: pull-get-versions
+      image: alpine/git:v2.40.1
       workingDir: $(workspaces.source.path)
       script: |
+        git config --global --add safe.directory $(workspaces.source.path)
         git status && git fetch -p --all
-    - name: get-versions
-      # because it has git
-      image: goreleaser/goreleaser
-      workingDir: $(workspaces.source.path)
-      script: |
-        echo -n $(git tag --points-at HEAD) > /tekton/results/version
-        echo -n $(git tag --points-at HEAD | sed 's/^v\([^\.]*\)\.\([^\.]*\).*/\1/') > /tekton/results/major
-        echo -n $(git tag --points-at HEAD | sed 's/^v\([^\.]*\)\.\([^\.]*\).*/\2/') > /tekton/results/minor
+        echo -n $(git tag --points-at HEAD) > $(results.version.path)
+        echo -n $(git tag --points-at HEAD | sed 's/^v\([^\.]*\)\.\([^\.]*\).*/\1/') > $(results.major.path)
+        echo -n $(git tag --points-at HEAD | sed 's/^v\([^\.]*\)\.\([^\.]*\).*/\2/') > $(results.minor.path)
   results:
     - name: version
     - name: major
diff --git a/tekton/release-pipeline.yml b/tekton/release-pipeline.yml
index de347a4b3e..a83b602f04 100644
--- a/tekton/release-pipeline.yml
+++ b/tekton/release-pipeline.yml
@@ -100,7 +100,7 @@ spec:
         - name: github-token-secret-key
           value: $(params.github-token-secret-key)
         - name: image
-          value: goreleaser/goreleaser:v1.11.5
+          value: goreleaser/goreleaser:v1.15.2
       workspaces:
         - name: source
           workspace: shared-workspace
diff --git a/tekton/release.sh b/tekton/release.sh
index 56d1fc0c67..2356c1c174 100755
--- a/tekton/release.sh
+++ b/tekton/release.sh
@@ -115,14 +115,15 @@ kubectl create namespace ${TARGET_NAMESPACE} 2>/dev/null || true
 
 for task in ${CATALOG_TASKS};do
   if [ ${task} == "lint" ]; then
-    kubectl -n ${TARGET_NAMESPACE} apply -f https://raw.githubusercontent.com/tektoncd/catalog/main/task/golangci-${task}/0.2/golangci-${task}.yaml
+    tkn -n ${TARGET_NAMESPACE} hub install task golangci-lint
   else
-    kubectl -n ${TARGET_NAMESPACE} apply -f https://raw.githubusercontent.com/tektoncd/catalog/main/task/golang-${task}/0.2/golang-${task}.yaml
+    tkn -n ${TARGET_NAMESPACE} hub install task golang-${task}
   fi
 done
 
-kubectl -n ${TARGET_NAMESPACE} apply -f https://raw.githubusercontent.com/tektoncd/catalog/main/task/git-clone/0.6/git-clone.yaml
-kubectl -n ${TARGET_NAMESPACE} apply -f https://raw.githubusercontent.com/tektoncd/catalog/main/task/goreleaser/0.2/goreleaser.yaml
+tkn -n ${TARGET_NAMESPACE} install task git-clone
+tkn -n ${TARGET_NAMESPACE} install task goreleaser
+
 kubectl -n ${TARGET_NAMESPACE} apply -f ./tekton/get-version.yaml
 kubectl -n ${TARGET_NAMESPACE} apply -f ./tekton/publish.yaml