Skip to content

Commit 1747a57

Browse files
raisavargheseraisavarghese
authored
Merge branch 'redhat-appstudio:main' into RHTAP-5642
2 parents 725489a + 33dddda commit 1747a57

File tree

211 files changed

+2704
-315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+2704
-315
lines changed

‎.tekton/tssc-cli-pull-request.yaml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
event == "pull_request"
1313
&& target_branch == "main"
1414
&& files.all.exists(x, !x.matches('^(?:docs|.github|.vscode|.ci)/|\\.md$|^(?:.*/)?(?:\\.gitignore|OWNERS|PROJECT|LICENSE.txt|.golangci.yaml|.goreleaser.yaml|.snyk|.dockerignore|yamllint.yaml)$'))
15-
creationTimestamp: null
15+
creationTimestamp:
1616
labels:
1717
appstudio.openshift.io/application: tssc-cli
1818
appstudio.openshift.io/component: tssc-cli
@@ -65,13 +65,11 @@ spec:
6565
name: output-image
6666
type: string
6767
- default: .
68-
description: Path to the source code of an application's component from where
69-
to build image.
68+
description: Path to the source code of an application's component from where to build image.
7069
name: path-context
7170
type: string
7271
- default: Dockerfile
73-
description: Path to the Dockerfile inside the context specified by parameter
74-
path-context
72+
description: Path to the Dockerfile inside the context specified by parameter path-context
7573
name: dockerfile
7674
type: string
7775
- default: "false"
@@ -91,8 +89,7 @@ spec:
9189
name: prefetch-input
9290
type: string
9391
- default: ""
94-
description: Image tag expiration time, time values could be something like
95-
1h, 2d, 3w for hours, days, and weeks, respectively.
92+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9693
name: image-expires-after
9794
type: string
9895
- default: "true"
@@ -112,10 +109,13 @@ spec:
112109
name: build-args-file
113110
type: string
114111
- default: "false"
115-
description: Whether to enable privileged mode, should be used only with remote
116-
VMs
112+
description: Whether to enable privileged mode, should be used only with remote VMs
117113
name: privileged-nested
118114
type: string
115+
- name: buildah-format
116+
default: docker
117+
type: string
118+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
119119
results:
120120
- description: ""
121121
name: IMAGE_URL
@@ -143,7 +143,7 @@ spec:
143143
- name: name
144144
value: init
145145
- name: bundle
146-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
146+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:526a104a3342e36dad5c5e7f98c647da6b2a33897e458f772ff4afe523e0690a
147147
- name: kind
148148
value: task
149149
resolver: bundles
@@ -229,14 +229,16 @@ spec:
229229
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
230230
- name: CACHI2_ARTIFACT
231231
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
232+
- name: BUILDAH_FORMAT
233+
value: $(params.buildah-format)
232234
runAfter:
233235
- prefetch-dependencies
234236
taskRef:
235237
params:
236238
- name: name
237239
value: buildah-oci-ta
238240
- name: bundle
239-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:fdd3f39c8ea97de0d77bcde160704dbd33fdcb9cd235836927bbb170aaefb80f
241+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
240242
- name: kind
241243
value: task
242244
resolver: bundles
@@ -258,6 +260,8 @@ spec:
258260
- name: IMAGES
259261
value:
260262
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
263+
- name: BUILDAH_FORMAT
264+
value: $(params.buildah-format)
261265
runAfter:
262266
- build-container
263267
taskRef:
@@ -385,7 +389,7 @@ spec:
385389
- name: name
386390
value: sast-snyk-check-oci-ta
387391
- name: bundle
388-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
392+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
389393
- name: kind
390394
value: task
391395
resolver: bundles
@@ -587,7 +591,7 @@ spec:
587591
- name: name
588592
value: rpms-signature-scan
589593
- name: bundle
590-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:c943625383f1cb95f9fd99506d13a5a12b9c91e7796ea14e228093f9d4995d10
594+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:06977232e67509e5540528ff6c3b081b23fc5bf3e40fb3e2d09a086d5c3243fc
591595
- name: kind
592596
value: task
593597
resolver: bundles

‎.tekton/tssc-cli-push.yaml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
event == "push"
1212
&& target_branch == "main"
1313
&& files.all.exists(x, !x.matches('^(?:docs|.github|.vscode|.ci)/|\\.md$|^(?:.*/)?(?:\\.gitignore|OWNERS|PROJECT|LICENSE.txt|.golangci.yaml|.goreleaser.yaml|.snyk|.dockerignore|yamllint.yaml)$'))
14-
creationTimestamp: null
14+
creationTimestamp:
1515
labels:
1616
appstudio.openshift.io/application: tssc-cli
1717
appstudio.openshift.io/component: tssc-cli
@@ -62,13 +62,11 @@ spec:
6262
name: output-image
6363
type: string
6464
- default: .
65-
description: Path to the source code of an application's component from where
66-
to build image.
65+
description: Path to the source code of an application's component from where to build image.
6766
name: path-context
6867
type: string
6968
- default: Dockerfile
70-
description: Path to the Dockerfile inside the context specified by parameter
71-
path-context
69+
description: Path to the Dockerfile inside the context specified by parameter path-context
7270
name: dockerfile
7371
type: string
7472
- default: "false"
@@ -88,8 +86,7 @@ spec:
8886
name: prefetch-input
8987
type: string
9088
- default: ""
91-
description: Image tag expiration time, time values could be something like
92-
1h, 2d, 3w for hours, days, and weeks, respectively.
89+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9390
name: image-expires-after
9491
type: string
9592
- default: "true"
@@ -109,10 +106,13 @@ spec:
109106
name: build-args-file
110107
type: string
111108
- default: "false"
112-
description: Whether to enable privileged mode, should be used only with remote
113-
VMs
109+
description: Whether to enable privileged mode, should be used only with remote VMs
114110
name: privileged-nested
115111
type: string
112+
- name: buildah-format
113+
default: docker
114+
type: string
115+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
116116
results:
117117
- description: ""
118118
name: IMAGE_URL
@@ -140,7 +140,7 @@ spec:
140140
- name: name
141141
value: init
142142
- name: bundle
143-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
143+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:526a104a3342e36dad5c5e7f98c647da6b2a33897e458f772ff4afe523e0690a
144144
- name: kind
145145
value: task
146146
resolver: bundles
@@ -226,14 +226,16 @@ spec:
226226
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
227227
- name: CACHI2_ARTIFACT
228228
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
229+
- name: BUILDAH_FORMAT
230+
value: $(params.buildah-format)
229231
runAfter:
230232
- prefetch-dependencies
231233
taskRef:
232234
params:
233235
- name: name
234236
value: buildah-oci-ta
235237
- name: bundle
236-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:fdd3f39c8ea97de0d77bcde160704dbd33fdcb9cd235836927bbb170aaefb80f
238+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
237239
- name: kind
238240
value: task
239241
resolver: bundles
@@ -255,6 +257,8 @@ spec:
255257
- name: IMAGES
256258
value:
257259
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
260+
- name: BUILDAH_FORMAT
261+
value: $(params.buildah-format)
258262
runAfter:
259263
- build-container
260264
taskRef:
@@ -382,7 +386,7 @@ spec:
382386
- name: name
383387
value: sast-snyk-check-oci-ta
384388
- name: bundle
385-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
389+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
386390
- name: kind
387391
value: task
388392
resolver: bundles
@@ -587,7 +591,7 @@ spec:
587591
- name: name
588592
value: rpms-signature-scan
589593
- name: bundle
590-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:c943625383f1cb95f9fd99506d13a5a12b9c91e7796ea14e228093f9d4995d10
594+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:06977232e67509e5540528ff6c3b081b23fc5bf3e40fb3e2d09a086d5c3243fc
591595
- name: kind
592596
value: task
593597
resolver: bundles

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Build
33
#
44

5-
FROM registry.redhat.io/openshift4/ose-tools-rhel9@sha256:497203991dcbca71275d691ec970ba480cb8e80c9ada6af876f5559abe0d6155 AS ose-tools
5+
FROM registry.redhat.io/openshift4/ose-tools-rhel9@sha256:cd1a7d92f7d4fccf64f8710af9fd2a5a0a538e8263def27d26e8c3d359e01881 AS ose-tools
66
FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6-1758501173 AS builder
77

88
USER root

‎go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ toolchain go1.24.5
77
require (
88
github.com/Masterminds/sprig/v3 v3.3.0
99
github.com/google/cel-go v0.26.1
10-
github.com/google/go-github/scrape v0.0.0-20250818135035-f137c94931a7
11-
github.com/google/go-github/v74 v74.0.0
10+
github.com/google/go-github/scrape v0.0.0-20251002143304-b7f068fbeea5
11+
github.com/google/go-github/v75 v75.0.0
1212
github.com/mark3labs/mcp-go v0.41.1
1313
github.com/onsi/gomega v1.38.2
14-
github.com/openshift/api v0.0.0-20250926020921-1517fca97fe3
15-
github.com/openshift/client-go v0.0.0-20250915125341-81c9dc83a675
14+
github.com/openshift/api v0.0.0-20251002150504-230d0e045316
15+
github.com/openshift/client-go v0.0.0-20250922201106-dd37bfd2e597
1616
github.com/pkg/errors v0.9.1
17-
github.com/quay/claircore v1.5.42
17+
github.com/quay/claircore v1.5.44
1818
github.com/spf13/cobra v1.10.1
1919
github.com/spf13/pflag v1.0.10
2020
gitlab.com/gitlab-org/api/client-go v0.148.1
@@ -52,7 +52,7 @@ require (
5252
github.com/containerd/platforms v1.0.0-rc.1 // indirect
5353
github.com/cyphar/filepath-securejoin v0.5.0 // indirect
5454
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
55-
github.com/docker/docker-credential-helpers v0.9.3 // indirect
55+
github.com/docker/docker-credential-helpers v0.9.4 // indirect
5656
github.com/docker/go-events v0.0.0-20250808211157-605354379745 // indirect
5757
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
5858
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
@@ -141,26 +141,26 @@ require (
141141
go.yaml.in/yaml/v2 v2.4.3 // indirect
142142
go.yaml.in/yaml/v3 v3.0.4 // indirect
143143
golang.org/x/crypto v0.42.0 // indirect
144-
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
144+
golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 // indirect
145145
golang.org/x/net v0.44.0 // indirect
146146
golang.org/x/oauth2 v0.31.0 // indirect
147147
golang.org/x/sync v0.17.0 // indirect
148148
golang.org/x/sys v0.36.0 // indirect
149149
golang.org/x/term v0.35.0 // indirect
150150
golang.org/x/text v0.29.0 // indirect
151151
golang.org/x/time v0.13.0 // indirect
152-
google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9 // indirect
153-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
152+
google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect
153+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 // indirect
154154
google.golang.org/grpc v1.75.1 // indirect
155-
google.golang.org/protobuf v1.36.9 // indirect
155+
google.golang.org/protobuf v1.36.10 // indirect
156156
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
157157
gopkg.in/inf.v0 v0.9.1 // indirect
158158
k8s.io/apiextensions-apiserver v0.33.3 // indirect
159159
k8s.io/apiserver v0.33.4 // indirect
160160
k8s.io/component-base v0.33.4 // indirect
161161
k8s.io/klog/v2 v2.130.1 // indirect
162162
k8s.io/kube-openapi v0.0.0-20250701173324-9bd5c66d9911 // indirect
163-
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
163+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
164164
oras.land/oras-go/v2 v2.6.0 // indirect
165165
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
166166
sigs.k8s.io/kustomize/api v0.20.1 // indirect

0 commit comments

Comments
 (0)