Skip to content

Commit 0107559

Browse files
Hyperkid123Hyperkid123
authored
Merge pull request #256 from Hyperkid123/chore/combined-konflux-deps
chore(deps): consolidate Konflux dependency updates
2 parents 98accca + 5289287 commit 0107559

16 files changed

Lines changed: 84 additions & 90 deletions

‎.claude/skills/claim-ticket/uv.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.tekton/platform-frontend-ai-dev-memory-server-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ spec:
347347
- name: name
348348
value: buildah
349349
- name: bundle
350-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.9@sha256:3fc80805977ca958b632dd4750847d0e71e943a7795d07359bdc64ec95a74f74
350+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.10@sha256:ae597944d7792b2e5d5bc5afe52c61793bb68f57017abdd62c5eab2186946cf9
351351
- name: kind
352352
value: task
353353
resolver: bundles

‎.tekton/platform-frontend-ai-dev-memory-server-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ spec:
220220
- name: name
221221
value: buildah
222222
- name: bundle
223-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.9@sha256:3fc80805977ca958b632dd4750847d0e71e943a7795d07359bdc64ec95a74f74
223+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.10@sha256:ae597944d7792b2e5d5bc5afe52c61793bb68f57017abdd62c5eab2186946cf9
224224
- name: kind
225225
value: task
226226
resolver: bundles

‎.tekton/platform-frontend-ai-dev-proxy-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ spec:
223223
- name: name
224224
value: buildah
225225
- name: bundle
226-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.9@sha256:3fc80805977ca958b632dd4750847d0e71e943a7795d07359bdc64ec95a74f74
226+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.10@sha256:ae597944d7792b2e5d5bc5afe52c61793bb68f57017abdd62c5eab2186946cf9
227227
- name: kind
228228
value: task
229229
resolver: bundles

‎.tekton/platform-frontend-ai-dev-proxy-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ spec:
220220
- name: name
221221
value: buildah
222222
- name: bundle
223-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.9@sha256:3fc80805977ca958b632dd4750847d0e71e943a7795d07359bdc64ec95a74f74
223+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.10@sha256:ae597944d7792b2e5d5bc5afe52c61793bb68f57017abdd62c5eab2186946cf9
224224
- name: kind
225225
value: task
226226
resolver: bundles

‎.tekton/platform-frontend-ai-dev-pull-request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ spec:
223223
- name: name
224224
value: buildah
225225
- name: bundle
226-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.9@sha256:3fc80805977ca958b632dd4750847d0e71e943a7795d07359bdc64ec95a74f74
226+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.10@sha256:ae597944d7792b2e5d5bc5afe52c61793bb68f57017abdd62c5eab2186946cf9
227227
- name: kind
228228
value: task
229229
resolver: bundles

‎.tekton/platform-frontend-ai-dev-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ spec:
220220
- name: name
221221
value: buildah
222222
- name: bundle
223-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.9@sha256:3fc80805977ca958b632dd4750847d0e71e943a7795d07359bdc64ec95a74f74
223+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.10@sha256:ae597944d7792b2e5d5bc5afe52c61793bb68f57017abdd62c5eab2186946cf9
224224
- name: kind
225225
value: task
226226
resolver: bundles

‎Dockerfile‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Dev proxy — build custom Caddy from source on UBI (passes EC)
2-
FROM registry.access.redhat.com/ubi9/go-toolset:latest@sha256:a2ba4645e7c424b08aa83ed7792e279683b0d33acbc5131b18183fd21e336c55 AS dev-proxy-builder
2+
FROM registry.access.redhat.com/ubi9/go-toolset:latest@sha256:49f5929f6674d75377902ddcc2f46baf7a5cfcaada2497ee43f66e090943afd6 AS dev-proxy-builder
33
COPY dev-proxy/ /tmp/dev-proxy/
44
RUN cd /tmp/dev-proxy \
55
&& go build -o /tmp/caddy .
66

77
# Build executor thin client (gh/glab shim that forwards via UDS to proxy sidecar)
8-
FROM registry.access.redhat.com/ubi9/go-toolset:latest@sha256:a2ba4645e7c424b08aa83ed7792e279683b0d33acbc5131b18183fd21e336c55 AS executor-client-builder
8+
FROM registry.access.redhat.com/ubi9/go-toolset:latest@sha256:49f5929f6674d75377902ddcc2f46baf7a5cfcaada2497ee43f66e090943afd6 AS executor-client-builder
99
WORKDIR /build
1010
COPY proxy/executor/ .
1111
RUN go mod download \
@@ -168,12 +168,6 @@ RUN cd .claude/skills/push-and-pr \
168168
&& uv run pytest -v --tb=short \
169169
&& echo "Push-and-PR skill tests passed!"
170170

171-
# Run auto-fork skill tests during build
172-
RUN cd .claude/skills/auto-fork \
173-
&& uv sync --frozen --all-extras \
174-
&& uv run pytest -v --tb=short \
175-
&& echo "Auto-fork skill tests passed!"
176-
177171
ENV HOME=/home/botuser
178172
USER botuser
179173

‎Dockerfile.runner‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
# instance/ — (optional) extra files, COPYed to /home/botuser/app/instance/
99

1010
# Dev proxy — build custom Caddy from source on UBI
11-
FROM registry.access.redhat.com/ubi9/go-toolset:latest@sha256:a2ba4645e7c424b08aa83ed7792e279683b0d33acbc5131b18183fd21e336c55 AS dev-proxy-builder
11+
FROM registry.access.redhat.com/ubi9/go-toolset:latest@sha256:49f5929f6674d75377902ddcc2f46baf7a5cfcaada2497ee43f66e090943afd6 AS dev-proxy-builder
1212
COPY dev-bot/dev-proxy/ /tmp/dev-proxy/
1313
RUN cd /tmp/dev-proxy \
1414
&& go build -o /tmp/caddy .
1515

1616
# Build executor thin client (gh/glab shim that forwards via UDS to proxy sidecar)
17-
FROM registry.access.redhat.com/ubi9/go-toolset:latest@sha256:a2ba4645e7c424b08aa83ed7792e279683b0d33acbc5131b18183fd21e336c55 AS executor-client-builder
17+
FROM registry.access.redhat.com/ubi9/go-toolset:latest@sha256:49f5929f6674d75377902ddcc2f46baf7a5cfcaada2497ee43f66e090943afd6 AS executor-client-builder
1818
WORKDIR /build
1919
COPY dev-bot/proxy/executor/ .
2020
RUN go mod download \

‎dev-proxy/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,21 +159,21 @@ require (
159159
go.uber.org/zap v1.28.0 // indirect
160160
go.uber.org/zap/exp v0.3.0 // indirect
161161
go.yaml.in/yaml/v3 v3.0.4 // indirect
162-
golang.org/x/crypto v0.52.0 // indirect
163-
golang.org/x/crypto/x509roots/fallback v0.0.0-20260526024921-9beb694f9766 // indirect
162+
golang.org/x/crypto v0.53.0 // indirect
163+
golang.org/x/crypto/x509roots/fallback v0.0.0-20260615213855-55aec0a86b4c // indirect
164164
golang.org/x/exp v0.0.0-20260529124908-c761662dc8c9 // indirect
165165
golang.org/x/mod v0.36.0 // indirect
166-
golang.org/x/net v0.55.0 // indirect
166+
golang.org/x/net v0.56.0 // indirect
167167
golang.org/x/oauth2 v0.36.0 // indirect
168-
golang.org/x/sync v0.20.0 // indirect
169-
golang.org/x/sys v0.45.0 // indirect
170-
golang.org/x/term v0.43.0 // indirect
171-
golang.org/x/text v0.37.0 // indirect
168+
golang.org/x/sync v0.21.0 // indirect
169+
golang.org/x/sys v0.46.0 // indirect
170+
golang.org/x/term v0.44.0 // indirect
171+
golang.org/x/text v0.38.0 // indirect
172172
golang.org/x/time v0.15.0 // indirect
173173
golang.org/x/tools v0.45.0 // indirect
174-
google.golang.org/api v0.282.0 // indirect
174+
google.golang.org/api v0.285.0 // indirect
175175
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect
176-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
176+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad // indirect
177177
google.golang.org/grpc v1.81.1 // indirect
178178
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect
179179
google.golang.org/protobuf v1.36.11 // indirect

0 commit comments

Comments
 (0)