Skip to content

Commit ca55fdd

Browse files
author
serverless-qe
committed
[release-v1.18] Sync Konflux configurations
1 parent b131ef5 commit ca55fdd

File tree

5 files changed

+137
-7
lines changed

5 files changed

+137
-7
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
image-controller.appstudio.redhat.com/update-component-image: "true"
66
labels:
77
appstudio.redhat.com/application: serverless-operator-138
8-
appstudio.redhat.com/component: kn-client-client-118
9-
name: kn-client-client-118
8+
appstudio.redhat.com/component: kn-client-cli-artifacts-118
9+
name: kn-client-cli-artifacts-118
1010
spec:
1111
image:
12-
name: serverless-operator-138/kn-client-client
12+
name: serverless-operator-138/kn-client-cli-artifacts
1313
visibility: public

.konflux/applications/serverless-operator-138/components/kn-client-client-118.yaml renamed to .konflux/applications/serverless-operator-138/components/kn-client-cli-artifacts-118.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ metadata:
44
annotations:
55
build.appstudio.openshift.io/pipeline: '{"name":"docker-build","bundle":"latest"}'
66
build.appstudio.openshift.io/request: configure-pac-no-mr
7-
name: kn-client-client-118
7+
name: kn-client-cli-artifacts-118
88
spec:
9-
componentName: kn-client-client-118
9+
componentName: kn-client-cli-artifacts-118
1010
application: serverless-operator-138
1111

1212
source:
1313
git:
1414
url: https://github.com/openshift-knative/client.git
1515
context:
16-
dockerfileUrl: openshift/ci-operator/knative-images/client/Dockerfile
16+
dockerfileUrl: openshift/ci-operator/knative-images/cli-artifacts/Dockerfile
1717
revision: release-v1.18

.tekton/docker-build.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,12 @@ spec:
419419
operator: in
420420
values:
421421
- "false"
422-
- name: clamav-scan
422+
- matrix:
423+
params:
424+
- name: image-arch
425+
value:
426+
- $(params.build-platforms)
427+
name: clamav-scan
423428
params:
424429
- name: image-digest
425430
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/openshift-knative/client?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
8+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
9+
pipelinesascode.tekton.dev/max-keep-runs: "3"
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-v1.18"
11+
creationTimestamp: null
12+
labels:
13+
appstudio.openshift.io/application: serverless-operator-138
14+
appstudio.openshift.io/component: kn-client-cli-artifacts-118
15+
pipelines.appstudio.openshift.io/type: build
16+
name: kn-client-cli-artifacts-118-on-pull-request
17+
namespace: ocp-serverless-tenant
18+
spec:
19+
params:
20+
- name: dockerfile
21+
value: openshift/ci-operator/knative-images/cli-artifacts/Dockerfile
22+
- name: build-args
23+
value:
24+
- CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
25+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
26+
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
27+
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
28+
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
29+
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
30+
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
31+
- VERSION=1.38.0
32+
- name: git-url
33+
value: '{{source_url}}'
34+
- name: hermetic
35+
value: "true"
36+
- name: image-expires-after
37+
value: 5d
38+
- name: output-image
39+
value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/kn-client-cli-artifacts:on-pr-{{revision}}
40+
- name: build-platforms
41+
value:
42+
- linux/x86_64
43+
- name: revision
44+
value: '{{revision}}'
45+
- name: prefetch-input
46+
value: '[{"path":".","type":"gomod"}]'
47+
taskRunSpecs:
48+
- pipelineTaskName: sast-shell-check
49+
stepSpecs:
50+
- name: sast-shell-check
51+
computeResources:
52+
requests:
53+
memory: 4Gi
54+
limits:
55+
memory: 4Gi
56+
pipelineRef:
57+
name: docker-build
58+
taskRunTemplate:
59+
serviceAccountName: build-pipeline-kn-client-cli-artifacts-118
60+
workspaces:
61+
- name: git-auth
62+
secret:
63+
secretName: '{{ git_auth_secret }}'
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
apiVersion: tekton.dev/v1
2+
kind: PipelineRun
3+
metadata:
4+
annotations:
5+
build.appstudio.openshift.io/repo: https://github.com/openshift-knative/client?rev={{revision}}
6+
build.appstudio.redhat.com/commit_sha: '{{revision}}'
7+
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
8+
pipelinesascode.tekton.dev/max-keep-runs: "3"
9+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-v1.18"
10+
creationTimestamp: null
11+
labels:
12+
appstudio.openshift.io/application: serverless-operator-138
13+
appstudio.openshift.io/component: kn-client-cli-artifacts-118
14+
pipelines.appstudio.openshift.io/type: build
15+
name: kn-client-cli-artifacts-118-on-push
16+
namespace: ocp-serverless-tenant
17+
spec:
18+
params:
19+
- name: dockerfile
20+
value: openshift/ci-operator/knative-images/cli-artifacts/Dockerfile
21+
- name: build-args
22+
value:
23+
- CLI_ARTIFACTS=brew.registry.redhat.io/rh-osbs/openshift-serverless-1-kn-cli-artifacts-rhel8:1.16.0
24+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
25+
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
26+
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
27+
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
28+
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
29+
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
30+
- VERSION=1.38.0
31+
- name: git-url
32+
value: '{{source_url}}'
33+
- name: hermetic
34+
value: "true"
35+
- name: output-image
36+
value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-138/kn-client-cli-artifacts:{{revision}}
37+
- name: revision
38+
value: '{{revision}}'
39+
- name: additional-tags
40+
value:
41+
- $(context.pipelineRun.uid)-{{revision}}
42+
- 1.38.0
43+
- latest
44+
- name: prefetch-input
45+
value: '[{"path":".","type":"gomod"}]'
46+
taskRunSpecs:
47+
- pipelineTaskName: sast-shell-check
48+
stepSpecs:
49+
- name: sast-shell-check
50+
computeResources:
51+
requests:
52+
memory: 4Gi
53+
limits:
54+
memory: 4Gi
55+
pipelineRef:
56+
name: docker-build
57+
taskRunTemplate:
58+
serviceAccountName: build-pipeline-kn-client-cli-artifacts-118
59+
workspaces:
60+
- name: git-auth
61+
secret:
62+
secretName: '{{ git_auth_secret }}'

0 commit comments

Comments
 (0)