From a198a42b0599599f2e8e1216dad454beb66dd78b Mon Sep 17 00:00:00 2001
From: Serverless QE Robot <86025630+serverless-qe@users.noreply.github.com>
Date: Thu, 13 Feb 2025 20:09:10 +0100
Subject: [PATCH] [release-v1.15] Update Konflux configurations (#1062)

* Generate dockerfiles with "./openshift/scripts/generate-dockerfiles.sh"

* [release-v1.15] Sync Konflux configurations

---------

Co-authored-by: serverless-qe <serverless-support@redhat.com>
---
 .tekton/docker-build.yaml                                 | 4 ++--
 .tekton/kn-plugin-func-func-util-115-pull-request.yaml    | 2 +-
 .tekton/kn-plugin-func-func-util-115-push.yaml            | 4 ++--
 openshift/ci-operator/knative-images/func-util/Dockerfile | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml
index 39bd1bb37f..1bd2855d10 100755
--- a/.tekton/docker-build.yaml
+++ b/.tekton/docker-build.yaml
@@ -468,9 +468,9 @@ spec:
     taskRef:
       params:
       - name: name
-        value: sast-shell-check-oci-ta
+        value: sast-unicode-check-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:9b0138a597445f3887697da69c9b8b91368f0b72b98e9304fa209b43523bd6fb
+        value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.1@sha256:3a128580c41abdac5bd76d0d1e066f2f3473278ba9fab90639878a27ced7a0e6
       - name: kind
         value: task
       resolver: bundles
diff --git a/.tekton/kn-plugin-func-func-util-115-pull-request.yaml b/.tekton/kn-plugin-func-func-util-115-pull-request.yaml
index 0a3cfa2a9a..3d088319e2 100755
--- a/.tekton/kn-plugin-func-func-util-115-pull-request.yaml
+++ b/.tekton/kn-plugin-func-func-util-115-pull-request.yaml
@@ -25,7 +25,7 @@ spec:
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
-        - VERSION=1.35.0
+        - VERSION=1.35.1
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-plugin-func-func-util-115-push.yaml b/.tekton/kn-plugin-func-func-util-115-push.yaml
index 45a0ad52bf..e349974077 100755
--- a/.tekton/kn-plugin-func-func-util-115-push.yaml
+++ b/.tekton/kn-plugin-func-func-util-115-push.yaml
@@ -24,7 +24,7 @@ spec:
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
-        - VERSION=1.35.0
+        - VERSION=1.35.1
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -36,7 +36,7 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.35.0
+        - 1.35.1
         - latest
     - name: prefetch-input
       value: '[{"type":"rpm"},{"path":".","type":"gomod"}]'
diff --git a/openshift/ci-operator/knative-images/func-util/Dockerfile b/openshift/ci-operator/knative-images/func-util/Dockerfile
index 1fa1711fb6..191353ae4f 100755
--- a/openshift/ci-operator/knative-images/func-util/Dockerfile
+++ b/openshift/ci-operator/knative-images/func-util/Dockerfile
@@ -24,7 +24,8 @@ COPY LICENSE /licenses/
 
 RUN ln -s /usr/bin/func-util /usr/local/bin/deploy && \
 	ln -s /usr/bin/func-util /usr/local/bin/scaffold && \
-	ln -s /usr/bin/func-util /usr/local/bin/s2i
+	ln -s /usr/bin/func-util /usr/local/bin/s2i && \
+	ln -s /usr/bin/func-util /usr/local/bin/s2i-generate
 
 USER 65532