Skip to content

Commit 0d79284

Browse files
serverless-qeserverless-qe
andauthored
[release-1.35] Sync Konflux configurations (#3373)
Co-authored-by: serverless-qe <[email protected]>
1 parent 18d7e46 commit 0d79284

25 files changed

+59
-40
lines changed

.github/workflows/dependabot-deps.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
name: Dependabot
23

34
on:
@@ -7,7 +8,7 @@ permissions:
78
contents: write
89

910
jobs:
10-
generate_some_code:
11+
update-deps:
1112
name: Update deps
1213
runs-on: ubuntu-latest
1314
if: ${{ github.actor == 'dependabot[bot]' }}
@@ -22,9 +23,13 @@ jobs:
2223
- name: Setup Golang
2324
uses: openshift-knative/hack/actions/setup-go@main
2425

25-
- name: Run ./hack/update-deps.sh
26+
- name: Install yq
27+
run: |
28+
go install github.com/mikefarah/yq/v3@latest
29+
30+
- name: Generate files
2631
working-directory: ./src/github.com/${{ github.repository }}
27-
run: ./hack/update-deps.sh
32+
run: make generated-files
2833

2934
- name: git push
3035
working-directory: ./src/github.com/${{ github.repository }}
@@ -34,6 +39,6 @@ jobs:
3439
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
3540
git config --local user.name "github-actions[bot]"
3641
git add .
37-
git commit -m "Run ./hack/update-deps.sh"
42+
git commit -m "Run make generated-files"
3843
git push
3944
fi

.tekton/docker-build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,9 @@ spec:
468468
taskRef:
469469
params:
470470
- name: name
471-
value: sast-shell-check-oci-ta
471+
value: sast-unicode-check-oci-ta
472472
- name: bundle
473-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:b00fa0294e6318ff8130ca11358ae0b3764c4e6c9a12ec7a953e1a813ca2e231
473+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.1@sha256:3a128580c41abdac5bd76d0d1e066f2f3473278ba9fab90639878a27ced7a0e6
474474
- name: kind
475475
value: task
476476
resolver: bundles

.tekton/fbc-builder.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,32 @@ spec:
321321
operator: in
322322
values:
323323
- "false"
324+
- name: fbc-target-index-pruning-check
325+
params:
326+
- name: IMAGE_URL
327+
value: $(tasks.build-image-index.results.IMAGE_URL)
328+
- name: IMAGE_DIGEST
329+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
330+
- name: TARGET_INDEX
331+
value: registry.redhat.io/redhat/redhat-operator-index
332+
- name: RENDERED_CATALOG_DIGEST
333+
value: $(tasks.validate-fbc.results.RENDERED_CATALOG_DIGEST)
334+
runAfter:
335+
- validate-fbc
336+
taskRef:
337+
params:
338+
- name: name
339+
value: fbc-target-index-pruning-check
340+
- name: bundle
341+
value: quay.io/konflux-ci/tekton-catalog/task-fbc-target-index-pruning-check:0.1@sha256:299c44a5d6930f7a2c878f20853c705f155231cae36d9f37add4cdb7e75e2e12
342+
- name: kind
343+
value: task
344+
resolver: bundles
345+
when:
346+
- input: $(params.skip-checks)
347+
operator: in
348+
values:
349+
- "false"
324350
workspaces:
325351
- name: git-auth
326352
optional: true

.tekton/serverless-bundle-135-pull-request.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
1010
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-1.35" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator/')) || files.all.exists(x, x.matches('^.tekton/')) )
11-
build.appstudio.openshift.io/build-nudge-files: ".*Dockerfile.*,olm-catalog/.*.yaml,olm-catalog/.*.yml,.*Containerfile.*"
1211
creationTimestamp: null
1312
labels:
1413
appstudio.openshift.io/application: serverless-operator-135
@@ -22,7 +21,7 @@ spec:
2221
value: olm-catalog/serverless-operator/Dockerfile
2322
- name: build-args
2423
value:
25-
- VERSION=1.35.0
24+
- VERSION=1.35.1
2625
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2726
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
2827
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-bundle-135-push.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ metadata:
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
88
pipelinesascode.tekton.dev/max-keep-runs: "3"
99
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-1.35" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator/')) || files.all.exists(x, x.matches('^.tekton/')) )
10-
build.appstudio.openshift.io/build-nudge-files: ".*Dockerfile.*,olm-catalog/.*.yaml,olm-catalog/.*.yml,.*Containerfile.*"
1110
creationTimestamp: null
1211
labels:
1312
appstudio.openshift.io/application: serverless-operator-135
@@ -21,7 +20,7 @@ spec:
2120
value: olm-catalog/serverless-operator/Dockerfile
2221
- name: build-args
2322
value:
24-
- VERSION=1.35.0
23+
- VERSION=1.35.1
2524
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2625
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
2726
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-index-135-fbc-414-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
value: ./olm-catalog/serverless-operator-index/v4.14
2424
- name: build-args
2525
value:
26-
- VERSION=1.35.0
26+
- VERSION=1.35.1
2727
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2828
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
2929
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-index-135-fbc-414-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
value: ./olm-catalog/serverless-operator-index/v4.14
2323
- name: build-args
2424
value:
25-
- VERSION=1.35.0
25+
- VERSION=1.35.1
2626
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2727
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
2828
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-index-135-fbc-415-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
value: ./olm-catalog/serverless-operator-index/v4.15
2424
- name: build-args
2525
value:
26-
- VERSION=1.35.0
26+
- VERSION=1.35.1
2727
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2828
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
2929
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-index-135-fbc-415-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
value: ./olm-catalog/serverless-operator-index/v4.15
2323
- name: build-args
2424
value:
25-
- VERSION=1.35.0
25+
- VERSION=1.35.1
2626
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2727
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
2828
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-index-135-fbc-416-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
value: ./olm-catalog/serverless-operator-index/v4.16
2424
- name: build-args
2525
value:
26-
- VERSION=1.35.0
26+
- VERSION=1.35.1
2727
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2828
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
2929
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

0 commit comments

Comments
 (0)