From b5e3e6780f3015f42fac55ce98bb63a496e10c39 Mon Sep 17 00:00:00 2001 From: "openshift-merge-bot[bot]" Date: Tue, 10 Feb 2026 11:48:34 +0000 Subject: [PATCH] Discover new branches and update pipelines --- .github/workflows/release-generate-ci.yaml | 384 +++++++++++++++++++++ config/backstage-plugins.yaml | 13 + config/client.yaml | 15 + config/eventing-integrations.yaml | 24 ++ config/eventing-istio.yaml | 9 + config/eventing-kafka-broker.yaml | 14 + config/eventing.yaml | 13 + config/kn-plugin-event.yaml | 8 + config/kn-plugin-func.yaml | 8 + config/serverless-operator.yaml | 12 +- pkg/konfluxgen/bundle-build.yaml | 41 +-- pkg/konfluxgen/docker-build.yaml | 43 +-- pkg/konfluxgen/docker-java-build.yaml | 123 +++++-- pkg/konfluxgen/fbc-builder.yaml | 35 +- pkg/konfluxgen/kustomize/docker-build.yaml | 43 +-- pkg/konfluxgen/kustomize/fbc-builder.yaml | 35 +- 16 files changed, 610 insertions(+), 210 deletions(-) diff --git a/.github/workflows/release-generate-ci.yaml b/.github/workflows/release-generate-ci.yaml index 8814dc020..fee8c8af2 100644 --- a/.github/workflows/release-generate-ci.yaml +++ b/.github/workflows/release-generate-ci.yaml @@ -525,6 +525,54 @@ jobs: fi gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/backstage-plugins + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[backstage-plugins - release-v1.21] Create Konflux PR' + run: | + set -x + repo="backstage-plugins" + branch="sync-konflux-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/backstage-plugins + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[backstage-plugins - release-v1.21] Create OWNERS file update PR' + run: | + set -x + repo="backstage-plugins" + branch="sync-owners-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/backstage-plugins - env: GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -861,6 +909,54 @@ jobs: fi gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/client + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[client - release-v1.21] Create Konflux PR' + run: | + set -x + repo="client" + branch="sync-konflux-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/client + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[client - release-v1.21] Create OWNERS file update PR' + run: | + set -x + repo="client" + branch="sync-owners-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/client - env: GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -1173,6 +1269,54 @@ jobs: fi gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-integrations + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[eventing-integrations - release-v1.21] Create Konflux PR' + run: | + set -x + repo="eventing-integrations" + branch="sync-konflux-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-integrations + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[eventing-integrations - release-v1.21] Create OWNERS file update PR' + run: | + set -x + repo="eventing-integrations" + branch="sync-owners-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-integrations - env: GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -1509,6 +1653,54 @@ jobs: fi gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-istio + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[eventing-istio - release-v1.21] Create Konflux PR' + run: | + set -x + repo="eventing-istio" + branch="sync-konflux-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-istio + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[eventing-istio - release-v1.21] Create OWNERS file update PR' + run: | + set -x + repo="eventing-istio" + branch="sync-owners-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-istio - env: GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -1845,6 +2037,54 @@ jobs: fi gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-kafka-broker + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[eventing-kafka-broker - release-v1.21] Create Konflux PR' + run: | + set -x + repo="eventing-kafka-broker" + branch="sync-konflux-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-kafka-broker + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[eventing-kafka-broker - release-v1.21] Create OWNERS file update PR' + run: | + set -x + repo="eventing-kafka-broker" + branch="sync-owners-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing-kafka-broker - env: GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -2181,6 +2421,54 @@ jobs: fi gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[eventing - release-v1.21] Create Konflux PR' + run: | + set -x + repo="eventing" + branch="sync-konflux-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[eventing - release-v1.21] Create OWNERS file update PR' + run: | + set -x + repo="eventing" + branch="sync-owners-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/eventing - env: GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -2517,6 +2805,54 @@ jobs: fi gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/kn-plugin-event + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[kn-plugin-event - release-1.21] Create Konflux PR' + run: | + set -x + repo="kn-plugin-event" + branch="sync-konflux-release-1.21" + target_branch="release-1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/kn-plugin-event + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[kn-plugin-event - release-1.21] Create OWNERS file update PR' + run: | + set -x + repo="kn-plugin-event" + branch="sync-owners-release-1.21" + target_branch="release-1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/kn-plugin-event - env: GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -2853,6 +3189,54 @@ jobs: fi gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/kn-plugin-func + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[kn-plugin-func - release-v1.21] Create Konflux PR' + run: | + set -x + repo="kn-plugin-func" + branch="sync-konflux-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update Konflux configurations" --body "Update Konflux components and pipelines" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/kn-plugin-func + - env: + GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} + if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} + name: '[kn-plugin-func - release-v1.21] Create OWNERS file update PR' + run: | + set -x + repo="kn-plugin-func" + branch="sync-owners-release-v1.21" + target_branch="release-v1.21" + git remote add fork "https://github.com/serverless-qe/$repo.git" || true # ignore: already exists errors + remote_exists=$(git ls-remote --heads fork "$branch") + if [ -z "$remote_exists" ]; then + # remote doesn't exist. + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f || exit 1 + fi + git fetch fork "$branch" + if git diff --quiet "fork/$branch" "$branch"; then + echo "Branches are identical. No need to force push." + else + git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/$repo.git" "$branch:$branch" -f + fi + gh pr create --base "$target_branch" --head "serverless-qe:$branch" --title "[$target_branch] Update OWNERS file" --body "Update OWNERS file" || true + working-directory: ./src/github.com/openshift-knative/hack/openshift-knative/kn-plugin-func - env: GH_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} GITHUB_TOKEN: ${{ secrets.SERVERLESS_QE_ROBOT }} diff --git a/config/backstage-plugins.yaml b/config/backstage-plugins.yaml index ca6a4376b..5acf75720 100644 --- a/config/backstage-plugins.yaml +++ b/config/backstage-plugins.yaml @@ -74,6 +74,19 @@ config: - onDemand: true version: "4.14" promotion: {} + release-v1.21: + konflux: + enabled: true + openShiftVersions: + - candidateRelease: true + onDemand: true + skipCron: true + version: "4.21" + - useClusterPool: true + version: "4.20" + - onDemand: true + version: "4.14" + promotion: {} repositories: - dockerfiles: {} e2e: diff --git a/config/client.yaml b/config/client.yaml index 033b42fb0..44222d887 100644 --- a/config/client.yaml +++ b/config/client.yaml @@ -86,6 +86,21 @@ config: useClusterPool: true version: "4.20" promotion: {} + release-v1.21: + konflux: + enabled: true + imageOverrides: + - name: CLI_ARTIFACTS + pullSpec: brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0 + openShiftVersions: + - candidateRelease: true + onDemand: true + skipCron: true + version: "4.21" + - skipCron: true + useClusterPool: true + version: "4.20" + promotion: {} repositories: - canonicalGoRepository: github.com/knative/client dockerfiles: {} diff --git a/config/eventing-integrations.yaml b/config/eventing-integrations.yaml index 042c6cf74..9f01999ab 100644 --- a/config/eventing-integrations.yaml +++ b/config/eventing-integrations.yaml @@ -143,6 +143,30 @@ config: promotion: {} skipDockerFilesMatches: - .*hermetic.* + release-v1.21: + konflux: + enabled: true + javaImages: + - .*eventing-integrations-aws-ddb-streams-source + - .*eventing-integrations-aws-s3-sink + - .*eventing-integrations-aws-s3-source + - .*eventing-integrations-aws-sns-sink + - .*eventing-integrations-aws-sqs-sink + - .*eventing-integrations-aws-sqs-source + - .*eventing-integrations-log-sink + - .*eventing-integrations-timer-source + openShiftVersions: + - candidateRelease: true + onDemand: true + skipCron: true + version: "4.21" + - useClusterPool: true + version: "4.20" + - onDemand: true + version: "4.14" + promotion: {} + skipDockerFilesMatches: + - .*hermetic.* repositories: - dockerfiles: {} e2e: diff --git a/config/eventing-istio.yaml b/config/eventing-istio.yaml index c2ee3f876..00711a4ae 100644 --- a/config/eventing-istio.yaml +++ b/config/eventing-istio.yaml @@ -73,6 +73,15 @@ config: - onDemand: true version: "4.14" promotion: {} + release-v1.21: + konflux: + enabled: true + openShiftVersions: + - useClusterPool: true + version: "4.20" + - onDemand: true + version: "4.14" + promotion: {} repositories: - dockerfiles: {} e2e: diff --git a/config/eventing-kafka-broker.yaml b/config/eventing-kafka-broker.yaml index 15f1050a3..3be23f488 100644 --- a/config/eventing-kafka-broker.yaml +++ b/config/eventing-kafka-broker.yaml @@ -109,6 +109,20 @@ config: promotion: {} skipDockerFilesMatches: - .*hermetic.* + release-v1.21: + konflux: + enabled: true + javaImages: + - .*eventing-kafka-broker-receiver + - .*eventing-kafka-broker-dispatcher + openShiftVersions: + - useClusterPool: true + version: "4.20" + - onDemand: true + version: "4.14" + promotion: {} + skipDockerFilesMatches: + - .*hermetic.* repositories: - dockerfiles: {} e2e: diff --git a/config/eventing.yaml b/config/eventing.yaml index 043c7b2f1..02b5c2f54 100644 --- a/config/eventing.yaml +++ b/config/eventing.yaml @@ -85,6 +85,19 @@ config: - onDemand: true version: "4.14" promotion: {} + release-v1.21: + konflux: + enabled: true + openShiftVersions: + - candidateRelease: true + onDemand: true + skipCron: true + version: "4.21" + - useClusterPool: true + version: "4.20" + - onDemand: true + version: "4.14" + promotion: {} repositories: - dockerfiles: {} e2e: diff --git a/config/kn-plugin-event.yaml b/config/kn-plugin-event.yaml index e5eb2306a..78bf67e02 100644 --- a/config/kn-plugin-event.yaml +++ b/config/kn-plugin-event.yaml @@ -54,6 +54,14 @@ config: useClusterPool: true version: "4.20" promotion: {} + release-1.21: + konflux: + enabled: true + openShiftVersions: + - skipCron: true + useClusterPool: true + version: "4.20" + promotion: {} release-next: openShiftVersions: - skipCron: true diff --git a/config/kn-plugin-func.yaml b/config/kn-plugin-func.yaml index 5c3f382e1..985c7a6f0 100644 --- a/config/kn-plugin-func.yaml +++ b/config/kn-plugin-func.yaml @@ -65,6 +65,14 @@ config: useClusterPool: true version: "4.20" promotion: {} + release-v1.21: + konflux: + enabled: true + openShiftVersions: + - skipCron: true + useClusterPool: true + version: "4.20" + promotion: {} repositories: - dockerfiles: {} ignoreConfigs: {} diff --git a/config/serverless-operator.yaml b/config/serverless-operator.yaml index 183b0bb33..23a56c78b 100644 --- a/config/serverless-operator.yaml +++ b/config/serverless-operator.yaml @@ -420,8 +420,8 @@ repositories: scenario serverless test: - as: operator-e2e - commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true MAP_TESTS=true - make test-e2e-with-kafka + commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true + MAP_TESTS=true make test-e2e-with-kafka from: serverless-source-image resources: limits: @@ -430,8 +430,8 @@ repositories: cpu: 100m memory: 200Mi - as: knative-serving-eventing-e2e - commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true MAP_TESTS=true - make test-upstream-e2e-no-upgrade + commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true + MAP_TESTS=true make test-upstream-e2e-no-upgrade from: serverless-source-image resources: limits: @@ -440,8 +440,8 @@ repositories: cpu: 100m memory: 200Mi - as: knative-eventing-kafka-broker-e2e - commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true MAP_TESTS=true - make test-upstream-e2e-kafka-no-upgrade + commands: GOPATH=/tmp/go PATH=$PATH:/tmp/go/bin SKIP_MESH_AUTH_POLICY_GENERATION=true + MAP_TESTS=true make test-upstream-e2e-kafka-no-upgrade from: serverless-source-image resources: limits: diff --git a/pkg/konfluxgen/bundle-build.yaml b/pkg/konfluxgen/bundle-build.yaml index 78eaa0063..1dae4d760 100644 --- a/pkg/konfluxgen/bundle-build.yaml +++ b/pkg/konfluxgen/bundle-build.yaml @@ -53,10 +53,6 @@ spec: path-context name: dockerfile type: string - - default: "false" - description: Force rebuild image - name: rebuild - type: string - default: "false" description: Skip checks against built image name: skip-checks @@ -164,15 +160,10 @@ spec: - name: name value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.7@sha256:7aa7141697734e450c6f91db0c545fb46bd4de1b0203812cf594459d11ea3e63 + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.8@sha256:f579f6d72db53da9e0b3f84e89d66d0f81c360a0785576308a93c3774b73be11 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: sast-snyk-check params: - name: ARGS @@ -220,7 +211,7 @@ spec: - name: name value: prefetch-dependencies-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c651d767709bea1bb2f52c37d19d332af4706fbbfe450724e314b286597795a2 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6 - name: kind value: task resolver: bundles @@ -250,12 +241,6 @@ spec: resolver: bundles - name: init params: - - name: image-url - value: $(params.output-image) - - name: rebuild - value: $(params.rebuild) - - name: skip-checks - value: $(params.skip-checks) - name: enable-cache-proxy value: $(params.enable-cache-proxy) taskRef: @@ -263,7 +248,7 @@ spec: - name: name value: init - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82 + value: quay.io/konflux-ci/tekton-catalog/task-init:0.3@sha256:aa6f8632cc23d605c5942505ff1d00280db16a6fda5c4c56c4ed9ae936b5fbc6 - name: kind value: task resolver: bundles @@ -288,11 +273,6 @@ spec: - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" workspaces: - name: basic-auth workspace: git-auth @@ -318,15 +298,10 @@ spec: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:05d3d8a5ded44c51b074a56a408ddf5d65c56b4c15e110abb1a99e3aff269d49 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:8fd2bd1329a833cf1c3c049c0044961d6f5d5bfc954ebf188c19a56852c42600 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-source-image params: - name: BINARY_IMAGE @@ -349,10 +324,6 @@ spec: value: task resolver: bundles when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - input: $(params.build-source-image) operator: in values: @@ -504,7 +475,7 @@ spec: - name: name value: push-dockerfile-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e + value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:6fb61bec5ef161225a850005233db68cfdc03ad54e1a54cc49cc98d98ea3d259 - name: kind value: task resolver: bundles @@ -521,7 +492,7 @@ spec: - name: name value: rpms-signature-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:f2df541f49b5310f343b55f58b0881a46a2b46c5df39a9c34563c5042b106f6f + value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a99d8fd4c9027356b18e5d2910cc44dbc2fcb53c384ba34696645d9e7faa9084 - name: kind value: task resolver: bundles diff --git a/pkg/konfluxgen/docker-build.yaml b/pkg/konfluxgen/docker-build.yaml index 08e76b327..c8b590e6a 100644 --- a/pkg/konfluxgen/docker-build.yaml +++ b/pkg/konfluxgen/docker-build.yaml @@ -58,10 +58,6 @@ spec: path-context name: dockerfile type: string - - default: "false" - description: Force rebuild image - name: rebuild - type: string - default: "false" description: Skip checks against built image name: skip-checks @@ -165,7 +161,7 @@ spec: - name: name value: prefetch-dependencies-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c651d767709bea1bb2f52c37d19d332af4706fbbfe450724e314b286597795a2 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6 - name: kind value: task resolver: bundles @@ -195,12 +191,6 @@ spec: resolver: bundles - name: init params: - - name: image-url - value: $(params.output-image) - - name: rebuild - value: $(params.rebuild) - - name: skip-checks - value: $(params.skip-checks) - name: enable-cache-proxy value: $(params.enable-cache-proxy) taskRef: @@ -208,7 +198,7 @@ spec: - name: name value: init - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82 + value: quay.io/konflux-ci/tekton-catalog/task-init:0.3@sha256:aa6f8632cc23d605c5942505ff1d00280db16a6fda5c4c56c4ed9ae936b5fbc6 - name: kind value: task resolver: bundles @@ -233,11 +223,6 @@ spec: - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" workspaces: - name: basic-auth workspace: git-auth @@ -290,15 +275,10 @@ spec: - name: name value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.7@sha256:7aa7141697734e450c6f91db0c545fb46bd4de1b0203812cf594459d11ea3e63 + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.8@sha256:f579f6d72db53da9e0b3f84e89d66d0f81c360a0785576308a93c3774b73be11 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-image-index params: - name: IMAGE @@ -321,15 +301,10 @@ spec: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:05d3d8a5ded44c51b074a56a408ddf5d65c56b4c15e110abb1a99e3aff269d49 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:8fd2bd1329a833cf1c3c049c0044961d6f5d5bfc954ebf188c19a56852c42600 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-source-image params: - name: BINARY_IMAGE @@ -352,10 +327,6 @@ spec: value: task resolver: bundles when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - input: $(params.build-source-image) operator: in values: @@ -425,7 +396,7 @@ spec: - name: name value: ecosystem-cert-preflight-checks - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:0c3f9d4707bf742a5209f2e2186211433c83d5fcc538c728e4c7df178b5eafb7 + value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:33b7133c0c132c361295c30947f73bd45a3a3b62a24b83f3d8cd7c71f757828c - name: kind value: task resolver: bundles @@ -532,7 +503,7 @@ spec: - name: name value: push-dockerfile-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e + value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:6fb61bec5ef161225a850005233db68cfdc03ad54e1a54cc49cc98d98ea3d259 - name: kind value: task resolver: bundles @@ -549,7 +520,7 @@ spec: - name: name value: rpms-signature-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:f2df541f49b5310f343b55f58b0881a46a2b46c5df39a9c34563c5042b106f6f + value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a99d8fd4c9027356b18e5d2910cc44dbc2fcb53c384ba34696645d9e7faa9084 - name: kind value: task resolver: bundles diff --git a/pkg/konfluxgen/docker-java-build.yaml b/pkg/konfluxgen/docker-java-build.yaml index 37e8742db..d1dd232d7 100644 --- a/pkg/konfluxgen/docker-java-build.yaml +++ b/pkg/konfluxgen/docker-java-build.yaml @@ -58,10 +58,6 @@ spec: path-context name: dockerfile type: string - - default: "false" - description: Force rebuild image - name: rebuild - type: string - default: "false" description: Skip checks against built image name: skip-checks @@ -118,6 +114,83 @@ spec: name: CHAINS-GIT_COMMIT value: $(tasks.clone-repository.results.commit) tasks: + - matrix: + params: + - name: PLATFORM + value: + - $(params.build-platforms) + name: build-images-deps + params: + - name: IMAGE + value: $(params.output-image)-deps + - name: DOCKERFILE + value: $(params.dockerfile).deps + - name: CONTEXT + value: $(params.path-context) + - name: HERMETIC + value: "false" + - name: PREFETCH_INPUT + value: $(params.prefetch-input) + - name: IMAGE_EXPIRES_AFTER + value: $(params.image-expires-after) + - name: COMMIT_SHA + value: $(tasks.clone-repository.results.commit) + - name: BUILD_ARGS + value: + - $(params.build-args[*]) + - name: BUILD_ARGS_FILE + value: $(params.build-args-file) + - name: SOURCE_ARTIFACT + value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) + - name: CACHI2_ARTIFACT + value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT) + - name: IMAGE_APPEND_PLATFORM + value: "true" + runAfter: + - prefetch-dependencies + taskRef: + params: + - name: name + value: buildah-remote-oci-ta + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.8@sha256:f579f6d72db53da9e0b3f84e89d66d0f81c360a0785576308a93c3774b73be11 + - name: kind + value: task + resolver: bundles + when: + - input: $(tasks.init.results.build) + operator: in + values: + - "true" + - name: build-image-index-deps + params: + - name: IMAGE + value: $(params.output-image)-deps + - name: COMMIT_SHA + value: $(tasks.clone-repository.results.commit) + - name: IMAGE_EXPIRES_AFTER + value: $(params.image-expires-after) + - name: ALWAYS_BUILD_INDEX + value: $(params.build-image-index) + - name: IMAGES + value: + - $(tasks.build-images-deps.results.IMAGE_REF[*]) + runAfter: + - build-images-deps + taskRef: + params: + - name: name + value: build-image-index + - name: bundle + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:8fd2bd1329a833cf1c3c049c0044961d6f5d5bfc954ebf188c19a56852c42600 + - name: kind + value: task + resolver: bundles + when: + - input: $(tasks.init.results.build) + operator: in + values: + - "true" - matrix: params: - name: PLATFORM @@ -127,6 +200,7 @@ spec: params: - name: BUILD_ARGS value: + - DEPS_IMAGE=$(tasks.build-image-index-deps.results.IMAGE_URL)@$(tasks.build-image-index-deps.results.IMAGE_DIGEST) - $(params.build-args[*]) - name: IMAGE value: $(params.output-image) @@ -161,21 +235,16 @@ spec: - name: IMAGE_APPEND_PLATFORM value: "true" runAfter: - - prefetch-dependencies + - build-image-index-deps taskRef: params: - name: name value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.7@sha256:7aa7141697734e450c6f91db0c545fb46bd4de1b0203812cf594459d11ea3e63 + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.8@sha256:f579f6d72db53da9e0b3f84e89d66d0f81c360a0785576308a93c3774b73be11 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: sast-snyk-check params: - name: ARGS @@ -223,7 +292,7 @@ spec: - name: name value: prefetch-dependencies-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c651d767709bea1bb2f52c37d19d332af4706fbbfe450724e314b286597795a2 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6 - name: kind value: task resolver: bundles @@ -253,12 +322,6 @@ spec: resolver: bundles - name: init params: - - name: image-url - value: $(params.output-image) - - name: rebuild - value: $(params.rebuild) - - name: skip-checks - value: $(params.skip-checks) - name: enable-cache-proxy value: $(params.enable-cache-proxy) taskRef: @@ -266,7 +329,7 @@ spec: - name: name value: init - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82 + value: quay.io/konflux-ci/tekton-catalog/task-init:0.3@sha256:aa6f8632cc23d605c5942505ff1d00280db16a6fda5c4c56c4ed9ae936b5fbc6 - name: kind value: task resolver: bundles @@ -291,11 +354,6 @@ spec: - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" workspaces: - name: basic-auth workspace: git-auth @@ -321,15 +379,10 @@ spec: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:05d3d8a5ded44c51b074a56a408ddf5d65c56b4c15e110abb1a99e3aff269d49 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:8fd2bd1329a833cf1c3c049c0044961d6f5d5bfc954ebf188c19a56852c42600 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-source-image params: - name: BINARY_IMAGE @@ -352,10 +405,6 @@ spec: value: task resolver: bundles when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - input: $(params.build-source-image) operator: in values: @@ -425,7 +474,7 @@ spec: - name: name value: ecosystem-cert-preflight-checks - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:0c3f9d4707bf742a5209f2e2186211433c83d5fcc538c728e4c7df178b5eafb7 + value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:33b7133c0c132c361295c30947f73bd45a3a3b62a24b83f3d8cd7c71f757828c - name: kind value: task resolver: bundles @@ -532,7 +581,7 @@ spec: - name: name value: push-dockerfile-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e + value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:6fb61bec5ef161225a850005233db68cfdc03ad54e1a54cc49cc98d98ea3d259 - name: kind value: task resolver: bundles @@ -549,7 +598,7 @@ spec: - name: name value: rpms-signature-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:f2df541f49b5310f343b55f58b0881a46a2b46c5df39a9c34563c5042b106f6f + value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a99d8fd4c9027356b18e5d2910cc44dbc2fcb53c384ba34696645d9e7faa9084 - name: kind value: task resolver: bundles diff --git a/pkg/konfluxgen/fbc-builder.yaml b/pkg/konfluxgen/fbc-builder.yaml index 526aa52b8..539cb607e 100644 --- a/pkg/konfluxgen/fbc-builder.yaml +++ b/pkg/konfluxgen/fbc-builder.yaml @@ -50,10 +50,6 @@ spec: path-context name: dockerfile type: string - - default: "false" - description: Force rebuild image - name: rebuild - type: string - default: "false" description: Skip checks against built image name: skip-checks @@ -121,12 +117,6 @@ spec: resolver: bundles - name: init params: - - name: image-url - value: $(params.output-image) - - name: rebuild - value: $(params.rebuild) - - name: skip-checks - value: $(params.skip-checks) - name: enable-cache-proxy value: $(params.enable-cache-proxy) taskRef: @@ -134,7 +124,7 @@ spec: - name: name value: init - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82 + value: quay.io/konflux-ci/tekton-catalog/task-init:0.3@sha256:aa6f8632cc23d605c5942505ff1d00280db16a6fda5c4c56c4ed9ae936b5fbc6 - name: kind value: task resolver: bundles @@ -159,11 +149,6 @@ spec: - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" workspaces: - name: basic-auth workspace: git-auth @@ -209,7 +194,7 @@ spec: - name: name value: prefetch-dependencies-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c651d767709bea1bb2f52c37d19d332af4706fbbfe450724e314b286597795a2 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6 - name: kind value: task resolver: bundles @@ -263,15 +248,10 @@ spec: - name: name value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.7@sha256:7aa7141697734e450c6f91db0c545fb46bd4de1b0203812cf594459d11ea3e63 + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.8@sha256:f579f6d72db53da9e0b3f84e89d66d0f81c360a0785576308a93c3774b73be11 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-image-index params: - name: IMAGE @@ -292,15 +272,10 @@ spec: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:05d3d8a5ded44c51b074a56a408ddf5d65c56b4c15e110abb1a99e3aff269d49 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:8fd2bd1329a833cf1c3c049c0044961d6f5d5bfc954ebf188c19a56852c42600 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: deprecated-base-image-check params: - name: IMAGE_URL @@ -386,7 +361,7 @@ spec: - name: name value: fbc-fips-check-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:15c3b922a066b6f13ca74a527cd48a96d1046fc65ae739f89226b077f8efa0fd + value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:d498c722419805d2d737255a69acb542d0ae67acf6eea564757f0033914666bc - name: kind value: task resolver: bundles diff --git a/pkg/konfluxgen/kustomize/docker-build.yaml b/pkg/konfluxgen/kustomize/docker-build.yaml index 645ef777a..e9896f962 100644 --- a/pkg/konfluxgen/kustomize/docker-build.yaml +++ b/pkg/konfluxgen/kustomize/docker-build.yaml @@ -33,10 +33,6 @@ spec: path-context name: dockerfile type: string - - default: "false" - description: Force rebuild image - name: rebuild - type: string - default: "false" description: Skip checks against built image name: skip-checks @@ -105,12 +101,6 @@ spec: tasks: - name: init params: - - name: image-url - value: $(params.output-image) - - name: rebuild - value: $(params.rebuild) - - name: skip-checks - value: $(params.skip-checks) - name: enable-cache-proxy value: $(params.enable-cache-proxy) taskRef: @@ -118,7 +108,7 @@ spec: - name: name value: init - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82 + value: quay.io/konflux-ci/tekton-catalog/task-init:0.3@sha256:aa6f8632cc23d605c5942505ff1d00280db16a6fda5c4c56c4ed9ae936b5fbc6 - name: kind value: task resolver: bundles @@ -143,11 +133,6 @@ spec: - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" workspaces: - name: basic-auth workspace: git-auth @@ -168,7 +153,7 @@ spec: - name: name value: prefetch-dependencies-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c651d767709bea1bb2f52c37d19d332af4706fbbfe450724e314b286597795a2 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6 - name: kind value: task resolver: bundles @@ -226,15 +211,10 @@ spec: - name: name value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.7@sha256:7aa7141697734e450c6f91db0c545fb46bd4de1b0203812cf594459d11ea3e63 + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.8@sha256:f579f6d72db53da9e0b3f84e89d66d0f81c360a0785576308a93c3774b73be11 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-image-index params: - name: IMAGE @@ -257,15 +237,10 @@ spec: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:05d3d8a5ded44c51b074a56a408ddf5d65c56b4c15e110abb1a99e3aff269d49 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:8fd2bd1329a833cf1c3c049c0044961d6f5d5bfc954ebf188c19a56852c42600 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-source-image params: - name: BINARY_IMAGE @@ -288,10 +263,6 @@ spec: value: task resolver: bundles when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - input: $(params.build-source-image) operator: in values: @@ -361,7 +332,7 @@ spec: - name: name value: ecosystem-cert-preflight-checks - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:0c3f9d4707bf742a5209f2e2186211433c83d5fcc538c728e4c7df178b5eafb7 + value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:33b7133c0c132c361295c30947f73bd45a3a3b62a24b83f3d8cd7c71f757828c - name: kind value: task resolver: bundles @@ -577,7 +548,7 @@ spec: - name: name value: push-dockerfile-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e + value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:6fb61bec5ef161225a850005233db68cfdc03ad54e1a54cc49cc98d98ea3d259 - name: kind value: task resolver: bundles @@ -594,7 +565,7 @@ spec: - name: name value: rpms-signature-scan - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:f2df541f49b5310f343b55f58b0881a46a2b46c5df39a9c34563c5042b106f6f + value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:a99d8fd4c9027356b18e5d2910cc44dbc2fcb53c384ba34696645d9e7faa9084 - name: kind value: task resolver: bundles diff --git a/pkg/konfluxgen/kustomize/fbc-builder.yaml b/pkg/konfluxgen/kustomize/fbc-builder.yaml index ae2a0915a..16409cae2 100644 --- a/pkg/konfluxgen/kustomize/fbc-builder.yaml +++ b/pkg/konfluxgen/kustomize/fbc-builder.yaml @@ -33,10 +33,6 @@ spec: path-context name: dockerfile type: string - - default: "false" - description: Force rebuild image - name: rebuild - type: string - default: "false" description: Skip checks against built image name: skip-checks @@ -95,12 +91,6 @@ spec: tasks: - name: init params: - - name: image-url - value: $(params.output-image) - - name: rebuild - value: $(params.rebuild) - - name: skip-checks - value: $(params.skip-checks) - name: enable-cache-proxy value: $(params.enable-cache-proxy) taskRef: @@ -108,7 +98,7 @@ spec: - name: name value: init - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ebf06778aeacbbeb081f9231eafbdfdb8e380ad04e211d7ed80ae9101e37fd82 + value: quay.io/konflux-ci/tekton-catalog/task-init:0.3@sha256:aa6f8632cc23d605c5942505ff1d00280db16a6fda5c4c56c4ed9ae936b5fbc6 - name: kind value: task resolver: bundles @@ -133,11 +123,6 @@ spec: - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" workspaces: - name: basic-auth workspace: git-auth @@ -183,7 +168,7 @@ spec: - name: name value: prefetch-dependencies-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c651d767709bea1bb2f52c37d19d332af4706fbbfe450724e314b286597795a2 + value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:c664a6df6514b59c3ce53570b0994b45af66ecc89ba2a8e41834eae0622addf6 - name: kind value: task resolver: bundles @@ -237,15 +222,10 @@ spec: - name: name value: buildah-remote-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.7@sha256:7aa7141697734e450c6f91db0c545fb46bd4de1b0203812cf594459d11ea3e63 + value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.8@sha256:f579f6d72db53da9e0b3f84e89d66d0f81c360a0785576308a93c3774b73be11 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-image-index params: - name: IMAGE @@ -266,15 +246,10 @@ spec: - name: name value: build-image-index - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:05d3d8a5ded44c51b074a56a408ddf5d65c56b4c15e110abb1a99e3aff269d49 + value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:8fd2bd1329a833cf1c3c049c0044961d6f5d5bfc954ebf188c19a56852c42600 - name: kind value: task resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: deprecated-base-image-check params: - name: IMAGE_URL @@ -377,7 +352,7 @@ spec: - name: name value: fbc-fips-check-oci-ta - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:15c3b922a066b6f13ca74a527cd48a96d1046fc65ae739f89226b077f8efa0fd + value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:d498c722419805d2d737255a69acb542d0ae67acf6eea564757f0033914666bc - name: kind value: task resolver: bundles