[bot:release-v1.22.x] update konflux configuration

Generated by workflow [Generate konflux configurations](https://github.com/openshift-pipelines/hack/actions/runs/22086275163)
Triggered by pramodbindal

Author: openshift-pipelines-bot

.github/workflows/auto-merge-upstream.yaml

@@ -6,6 +6,8 @@ on:
 
 jobs:
   auto-approve-and-merge:
+    # This line prevents the job from running if CodeFreeze is true
+    if: false
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
@@ -19,35 +21,43 @@ jobs:
         gh auth status
         git config user.name openshift-pipelines-bot
         git config user.email pipelines-extcomm@redhat.com
-        # Approve and merge pull-request with no reviews
 
         pr_list=$(gh pr list \
           --state open \
+          --base release-v1.22.x \
+          --search 'label:upstream -label:do-not-merge/hold' \
+          --json number \
+          --jq '.[]|.number')
+        
+        success_pr_list=$(gh pr list \
+          --state open \
+          --base release-v1.22.x \
           --search 'label:upstream -label:do-not-merge/hold' \
           --json number,title,statusCheckRollup \
           --jq ' .[]| select((.statusCheckRollup // [])| all(.conclusion == "SUCCESS" or .conclusion == "SKIPPED"))| "\(.number)"')    
         
         echo "pr_list=$pr_list"  >> "$GITHUB_OUTPUT"
+        echo "success_pr_list=$success_pr_list"  >> "$GITHUB_OUTPUT"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: add LGTM Label
+    - name: Approve and add LGTM Label
       run: |
         # Approve and merge pull-request with no reviews
         for p in $pr_list; do
           echo "Adding lgtm label to  PR $p"
-          gh pr edit $p --add-label "lgtm" || true
+          gh pr edit $p --add-label "lgtm" --add-label "approved" || true
         done
       env:
         pr_list: ${{ steps.list-prs.outputs.pr_list }} 
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Merging PRs
       run: |
         # Approve and merge pull-request with no reviews
-        for p in $pr_list; do
+        for p in $success_pr_list; do
           echo "Merging  PR $p"
           gh pr merge --rebase --delete-branch --auto $p
         done
       env:
-        pr_list: ${{ steps.list-prs.outputs.pr_list }} 
+        success_pr_list: ${{ steps.list-prs.outputs.success_pr_list }} 
         GH_TOKEN: ${{ secrets.OPENSHIFT_PIPELINES_ROBOT }}

.konflux/dockerfiles/tkn.Dockerfile

@@ -31,15 +31,16 @@ ARG VERSION=tkn-next
 COPY --from=builder /tmp/tkn /usr/bin
 COPY --from=builder /tmp/tkn-pac /usr/bin
 LABEL \
-      com.redhat.component="openshift-pipelines-cli-tkn-container" \
-      name="openshift-pipelines/pipelines-cli-tkn-rhel9" \
-      version=$VERSION \
-      summary="Red Hat OpenShift pipelines tkn CLI" \
-      description="CLI client 'tkn' for managing openshift pipelines" \
-      io.k8s.display-name="Red Hat OpenShift Pipelines tkn CLI" \
+      com.redhat.component="openshift-pipelines-cli-tkn-rhel9-container" \
+      cpe="cpe:/a:redhat:openshift_pipelines:1.22::el9" \
+      description="Red Hat OpenShift Pipelines tektoncd-cli tkn" \
+      io.k8s.description="Red Hat OpenShift Pipelines tektoncd-cli tkn" \
+      io.k8s.display-name="Red Hat OpenShift Pipelines tektoncd-cli tkn" \
+      io.openshift.tags="tekton,openshift,tektoncd-cli,tkn" \
       maintainer="pipelines-extcomm@redhat.com" \
-      io.k8s.description="Red Hat OpenShift Pipelines tkn CLI" \
-      io.openshift.tags="pipelines,tekton,openshift"
+      name="openshift-pipelines/pipelines-cli-tkn-rhel9" \
+      summary="Red Hat OpenShift Pipelines tektoncd-cli tkn" \
+      version="v1.22.0"
 
 RUN groupadd -r -g 65532 nonroot && useradd --no-log-init -r -u 65532 -g nonroot nonroot
 USER 65532