Skip to content

Commit 4ef27cd

Browse files
committed
Merge branch 'ci-updates' into 'enterprise'
fix: address Docker Scout CVEs across all images See merge request dkinternal/observability/dataops-observability!65
2 parents 26a2272 + c0d6adc commit 4ef27cd

7 files changed

Lines changed: 9 additions & 8 deletions

File tree

deploy/charts/observability-app/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: dataops-observability-app
33
type: application
44
appVersion: "2"
5-
version: "3.0.0"
5+
version: "3.0.1"
66

77
description: DataOps Observability
88
home: https://datakitchen.io

deploy/charts/observability-services/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ maintainers:
1212
url: https://datakitchen.io
1313

1414
appVersion: "2"
15-
version: "3.0.0"
15+
version: "3.0.1"

deploy/docker/observability-be.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ RUN python3 -O -m pip install --no-deps /tmp/dk --prefix=/dk
3232

3333
FROM ${BASE_IMAGE_URL}python:3.12.11-alpine3.22 AS runtime-image
3434

35-
RUN apk update && apk upgrade && apk add --no-cache librdkafka=2.10.0-r0
35+
RUN apk update && apk upgrade && apk add --no-cache librdkafka=2.10.0-r0 \
36+
&& pip install --no-cache-dir --upgrade pip
3637

3738
# Grab the pre-built app from the build-image. This way we don't have
3839
# excess laying around in the final image.

observability_ui/apps/shell/src/app/projects/instances/instance-tests/instance-tests.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
</a>
221221

222222
<a *ngIf="test.integrations | getIntegration: 'TESTGEN'"
223-
dkTooltip="View test results from DataOps TestGen"
223+
dkTooltip="View test results from TestGen"
224224
[dkTooltipShowArrow]="false"
225225
[routerLink]="['../..', { outlets: { rightPanel: [instanceId, 'tests', test.id, 'testgen'] } }]"
226226
class="action-link testgen-link">

observability_ui/apps/shell/src/app/projects/instances/instances.translation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const instancesTranslation = {
2828
learnMore: 'Data Journeys'
2929
},
3030
testgen: {
31-
title: 'Test Results from DataOps TestGen',
31+
title: 'Test Results from TestGen',
3232
testData: {
3333
title: 'Test Data',
3434
metricValue: 'Metric Value',

observability_ui/apps/shell/src/app/projects/runs/run-tests/run-tests.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
</a>
203203

204204
<a *ngIf="test.integrations | getIntegration: 'TESTGEN'"
205-
dkTooltip="View test results from DataOps TestGen"
205+
dkTooltip="View test results from TestGen"
206206
[dkTooltipShowArrow]="false"
207207
[routerLink]="['../..', { outlets: { rightPanel: [runId, 'tests', test.id, 'testgen'] } }]"
208208
class="action-link testgen-link">

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ dependencies = [
2626
"blinker~=1.9.0",
2727
"boltons~=23.0.0",
2828
"confluent-kafka==2.4.0",
29-
"cryptography~=44.0.2",
29+
"cryptography~=46.0.5",
3030
"flask~=3.1.0",
3131
"gunicorn~=23.0.0",
3232
"log-color==2.0.0",
3333
"Marshmallow-Peewee~=3.4.3",
34-
"marshmallow~=3.19.0",
34+
"marshmallow~=3.26.2",
3535
"marshmallow-union==0.1.15.post1",
3636
"msgpack==1.0.4",
3737
"oauthlib~=3.2",

0 commit comments

Comments
 (0)