Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge upstream - using two kafka topics #240

Closed
wants to merge 45 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b511a10
Red Hat Konflux update maestro-main
Apr 29, 2024
2de6ce8
Scrub tektokn tasks from fork
gurnben Apr 29, 2024
f3cc2e9
Merge pull request #1 from stolostron/appstudio-maestro-main
skeeey May 7, 2024
8e3e30d
Merge branch 'openshift-online:main' into main
clyang82 May 17, 2024
f895c60
Enable build with kafka
clyang82 May 17, 2024
cd7e482
Merge pull request #5 from stolostron/kafka
skeeey May 17, 2024
059a1fa
Update Konflux references
Jun 10, 2024
764f8be
Migrate deprecated-base-image-check v0.3->v0.4
gurnben Jun 12, 2024
52898b6
Merge pull request #2 from stolostron/konflux/references/main
gurnben Jun 12, 2024
89e65b6
use openshift-golang-builder to fix security issues
clyang82 Jun 13, 2024
aa58095
Merge pull request #6 from stolostron/update_dockerfile
clyang82 Jun 13, 2024
f58a5ab
Update Konflux references
red-hat-konflux[bot] Jun 25, 2024
1d85034
Merge pull request #7 from stolostron/konflux/references/main
gurnben Jun 26, 2024
5a86b81
Update Konflux references
red-hat-konflux[bot] Jun 27, 2024
f8c848d
upgrade maestro
skeeey Jul 11, 2024
351a264
Merge pull request #9 from stolostron/konflux/references/main
skeeey Jul 11, 2024
845f8e5
chore(deps): update konflux references
red-hat-konflux[bot] Jul 11, 2024
ef39936
Merge pull request #10 from stolostron/konflux/references/main
skeeey Jul 12, 2024
d2bdfcf
chore(deps): update docker.io/library/eclipse-mosquitto docker tag to…
red-hat-konflux[bot] Oct 16, 2024
747aed9
chore(deps): update openapitools/openapi-generator-cli docker tag to …
red-hat-konflux[bot] Nov 18, 2024
9c3f3e3
chore(deps): update docker.io/library/postgres docker tag to v17
red-hat-konflux[bot] Nov 23, 2024
6ed44e6
chore(deps): update konflux references
red-hat-konflux[bot] Nov 30, 2024
6c3d4b0
Manually do migration
clyang82 Dec 6, 2024
900d744
Merge pull request #17 from stolostron/renovate/docker.io-library-ecl…
clyang82 Dec 6, 2024
e559abe
Merge pull request #16 from stolostron/renovate/docker.io-library-pos…
clyang82 Dec 6, 2024
76bc9a3
Merge pull request #14 from stolostron/konflux/mintmaker/main/openapi…
clyang82 Dec 6, 2024
38b17bb
Merge pull request #11 from stolostron/konflux/references/main
clyang82 Dec 6, 2024
eb5580b
Red Hat Konflux update maestro-main
Apr 29, 2024
8182d82
Enable build with kafka
clyang82 May 17, 2024
6f7b916
Update Konflux references
Jun 10, 2024
23af57f
Migrate deprecated-base-image-check v0.3->v0.4
gurnben Jun 12, 2024
bda042d
use openshift-golang-builder to fix security issues
clyang82 Jun 13, 2024
da0f007
Update Konflux references
red-hat-konflux[bot] Jun 25, 2024
24219c3
Update Konflux references
red-hat-konflux[bot] Jun 27, 2024
b7de4a9
chore(deps): update konflux references
red-hat-konflux[bot] Jul 11, 2024
5ad74cb
chore(deps): update konflux references
red-hat-konflux[bot] Nov 30, 2024
fd5eb1b
Manually do migration
clyang82 Dec 6, 2024
4a5a5a1
fix conflicts
clyang82 Dec 6, 2024
428b846
Merge pull request #18 from stolostron/merge
clyang82 Dec 6, 2024
308b9fc
Fix Enterprise Contract Check
clyang82 Dec 12, 2024
5d6aa8e
Downgrade ubuntu to 22.04
clyang82 Dec 12, 2024
35f7fe6
Merge pull request #20 from stolostron/fix_scan_issue
skeeey Dec 16, 2024
9b8a712
chore(deps): update konflux references
red-hat-konflux[bot] Dec 21, 2024
e56129a
Merge pull request #19 from stolostron/konflux/references/main
skeeey Dec 24, 2024
a7c48d5
merge upstream
skeeey Dec 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: https://github.com/openshift-online/maestro?rev={{revision}}
build.appstudio.openshift.io/repo: https://github.com/stolostron/maestro?rev={{revision}}
build.appstudio.redhat.com/commit_sha: '{{revision}}'
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main"
creationTimestamp: null
labels:
appstudio.openshift.io/application: maestro
appstudio.openshift.io/component: maestro
appstudio.openshift.io/application: maestro-main
appstudio.openshift.io/component: maestro-main
pipelines.appstudio.openshift.io/type: build
name: maestro-on-pull-request
namespace: maestro-rhtap-tenant
name: maestro-main-on-pull-request
namespace: crt-redhat-acm-tenant
spec:
params:
- name: dockerfile
Expand All @@ -24,7 +25,7 @@ spec:
- name: image-expires-after
value: 5d
- name: output-image
value: quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro:on-pr-{{revision}}
value: quay.io/redhat-user-workloads/crt-redhat-acm-tenant/maestro-main/maestro-main:on-pr-{{revision}}
- name: path-context
value: .
- name: revision
Expand Down Expand Up @@ -63,6 +64,9 @@ spec:
- name: kind
value: task
resolver: bundles
workspaces:
- name: workspace
workspace: workspace
params:
- description: Source Repository URL
name: git-url
Expand All @@ -75,11 +79,13 @@ spec:
name: output-image
type: string
- default: .
description: Path to the source code of an application's component from where to build image.
description: Path to the source code of an application's component from where
to build image.
name: path-context
type: string
- default: Dockerfile
description: Path to the Dockerfile inside the context specified by parameter path-context
description: Path to the Dockerfile inside the context specified by parameter
path-context
name: dockerfile
type: string
- default: "false"
Expand All @@ -90,10 +96,6 @@ spec:
description: Skip checks against built image
name: skip-checks
type: string
- default: "true"
description: Skip optional checks, set false if you want to run optional checks
name: skip-optional
type: string
- default: "false"
description: Execute the build with network isolation
name: hermetic
Expand All @@ -107,12 +109,18 @@ spec:
name: java
type: string
- default: ""
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
description: Image tag expiration time, time values could be something like
1h, 2d, 3w for hours, days, and weeks, respectively.
name: image-expires-after
- default: "false"
description: Build a source image.
name: build-source-image
type: string
- default: ""
description: Path to a file with build arguments which will be passed to podman
during build
name: build-args-file
type: string
results:
- description: ""
name: IMAGE_URL
Expand All @@ -138,18 +146,12 @@ spec:
value: $(params.rebuild)
- name: skip-checks
value: $(params.skip-checks)
- name: skip-optional
value: $(params.skip-optional)
- name: pipelinerun-name
value: $(context.pipelineRun.name)
- name: pipelinerun-uid
value: $(context.pipelineRun.uid)
taskRef:
params:
- name: name
value: init
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-init:0.2@sha256:07b8eb6a9533525a397c296246d3eb6ec4771b520a1bfee817ce2b7ede25c43d
value: quay.io/redhat-appstudio-tekton-catalog/task-init:0.2@sha256:ad2c6461433b867a5b8c5243048014f71295f4f7b0b684e6289246e37f698204
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -191,7 +193,7 @@ spec:
- name: name
value: prefetch-dependencies
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-prefetch-dependencies:0.1@sha256:cd873246e0d830d8b3d0dc76334348474361101487457f65bc02aab9861aad2c
value: quay.io/redhat-appstudio-tekton-catalog/task-prefetch-dependencies:0.1@sha256:befbcd715d146f52e6421a3cce34d1b93ffcb069a0271621c04d4f6f334ddb35
- name: kind
value: task
resolver: bundles
Expand All @@ -203,6 +205,8 @@ spec:
workspaces:
- name: source
workspace: workspace
- name: git-basic-auth
workspace: git-auth
- name: build-container
params:
- name: IMAGE
Expand All @@ -219,14 +223,16 @@ spec:
value: $(params.image-expires-after)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: BUILD_ARGS_FILE
value: $(params.build-args-file)
runAfter:
- prefetch-dependencies
taskRef:
params:
- name: name
value: buildah
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-buildah:0.2@sha256:ccd1cebde461112883df1fa2be45d3f81b142e9fb72fb04347840e9830f2a66e
value: quay.io/redhat-appstudio-tekton-catalog/task-buildah:0.2@sha256:19d56a5cb8cf0d208fd9d01925aadce96d95b02fc234089e362b69d8537dc2a5
- name: kind
value: task
resolver: bundles
Expand All @@ -249,7 +255,7 @@ spec:
- name: name
value: source-build
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-source-build:0.1@sha256:399cddeda7b33ef16872d469d0e2bb5f44a3ff0efa7d3cffa4bd9ff7130faea6
value: quay.io/redhat-appstudio-tekton-catalog/task-source-build:0.1@sha256:f1784097dad71fa3648bc7ffd9d285ae53a9da51ab8541cfa8871b9fd6d41d0d
- name: kind
value: task
resolver: bundles
Expand Down Expand Up @@ -278,7 +284,7 @@ spec:
- name: name
value: deprecated-image-check
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-deprecated-image-check:0.4@sha256:566ae0df80f8447558595a996627bf0b5482dc0eaa9fbc33b8154587aed51a05
value: quay.io/redhat-appstudio-tekton-catalog/task-deprecated-image-check:0.4@sha256:0ad98ffb3409f87f94ac7608838a142fed3eace02d7b815c0c63f4232b988e1a
- name: kind
value: task
resolver: bundles
Expand All @@ -300,7 +306,7 @@ spec:
- name: name
value: clair-scan
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-clair-scan:0.2@sha256:bcc01fe4689fbb87ca335d7efea88ec800e05d8796f0828fca984349b7844b09
value: quay.io/redhat-appstudio-tekton-catalog/task-clair-scan:0.2@sha256:0bf7059322544cec08fae9c159be8c1d4a5d1f2ad145446aa8f169e6cddc0294
- name: kind
value: task
resolver: bundles
Expand All @@ -309,15 +315,35 @@ spec:
operator: in
values:
- "false"
- name: sast-snyk-check
- name: ecosystem-cert-preflight-checks
params:
- name: image-url
value: $(tasks.build-container.results.IMAGE_URL)
runAfter:
- build-container
taskRef:
params:
- name: name
value: ecosystem-cert-preflight-checks
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-ecosystem-cert-preflight-checks:0.1@sha256:13a1013abebdd8dc398c41d2c72da41664086d390ea6ab9912905c1dfee08fbf
- name: kind
value: task
resolver: bundles
when:
- input: $(params.skip-checks)
operator: in
values:
- "false"
- name: sast-snyk-check
runAfter:
- clone-repository
taskRef:
params:
- name: name
value: sast-snyk-check
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-sast-snyk-check:0.3@sha256:4ada9949fd195b50e33605ef06bb52a9bfb523d88529392972ac7a051d5bb549
value: quay.io/redhat-appstudio-tekton-catalog/task-sast-snyk-check:0.3@sha256:601cc915a8108bdcd9d55f56d35c21d12a01b577401a175acac4e87d2b1738ae
- name: kind
value: task
resolver: bundles
Expand All @@ -329,12 +355,29 @@ spec:
workspaces:
- name: workspace
workspace: workspace
- name: clamav-scan
params:
- name: image-digest
value: $(tasks.build-container.results.IMAGE_DIGEST)
- name: image-url
value: $(tasks.build-container.results.IMAGE_URL)
- name: clamav-scan
runAfter:
- build-container
taskRef:
params:
- name: name
value: clamav-scan
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-clamav-scan:0.2@sha256:5ec761447580484540a66dc00ac35a4fd0a0c046a6b33904b46727104b9aed2b
- name: kind
value: task
resolver: bundles
when:
- input: $(params.skip-checks)
operator: in
values:
- "false"
- name: rpms-signature-scan
params:
- name: image-digest
value: $(tasks.build-container.results.IMAGE_DIGEST)
Expand All @@ -345,9 +388,9 @@ spec:
taskRef:
params:
- name: name
value: clamav-scan
value: rpms-signature-scan
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-clamav-scan:0.2@sha256:d586428498a2e27ff7c0eb2591181f05e783871db0cc16112acd2e1ee0a77b8b
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:29da92041da40a42ea7a71fb248950c245e800a26112f01370fde0116d41c2b7
- name: kind
value: task
resolver: bundles
Expand Down
Loading