Skip to content

Commit 90bebed

Browse files
authored
Merge branch 'main' into buildless-dummy-endpoint
2 parents 2d14c3b + 1f55371 commit 90bebed

File tree

13 files changed

+48
-48
lines changed

13 files changed

+48
-48
lines changed

components/buildless-serverless/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.3-alpine3.21 AS builder
2+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.4-alpine3.22 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55
ENV BASE_APP_DIR=/workspace/go/src/github.com/kyma-project/serverless

components/buildless-serverless/Dockerfile.jobinit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.3-alpine3.21 AS builder
2+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.4-alpine3.22 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55
ENV BASE_APP_DIR=/workspace/go/src/github.com/kyma-project/serverless

components/operator/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
# Build the operator binary
7-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.3-alpine3.21 as builder
7+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.4-alpine3.22 AS builder
88

99
WORKDIR /workdir
1010

@@ -24,7 +24,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o operator ./components/o
2424

2525
# Replace main images in values.yaml
2626
# Bumping serverless images in the values.yaml - used for building "local" and "dev" images
27-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.21.3 as replacer
27+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.22.0 as replacer
2828

2929
WORKDIR /workdir
3030

components/runtimes/nodejs/nodejs20/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.21.3
1+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.22.0
22

33
# https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.20&repo=main&arch=&maintainer=
44
ENV NODE_VERSION=20.15.1-r0

components/runtimes/nodejs/nodejs20/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
},
1111
"dependencies": {
1212
"@opentelemetry/api": "^1.9.0",
13-
"@opentelemetry/exporter-trace-otlp-http": "^0.201.1",
14-
"@opentelemetry/instrumentation": "^0.201.1",
15-
"@opentelemetry/instrumentation-express": "^0.50.0",
16-
"@opentelemetry/instrumentation-http": "^0.201.1",
13+
"@opentelemetry/exporter-trace-otlp-http": "^0.202.0",
14+
"@opentelemetry/instrumentation": "^0.202.0",
15+
"@opentelemetry/instrumentation-express": "^0.51.0",
16+
"@opentelemetry/instrumentation-http": "^0.202.0",
1717
"@opentelemetry/propagator-b3": "^2.0.1",
1818
"@opentelemetry/sdk-trace-node": "^2.0.1",
1919
"@opentelemetry/sdk-trace-base": "^2.0.1",
2020
"@opentelemetry/sdk-metrics": "^2.0.1",
21-
"@opentelemetry/exporter-prometheus": "^0.201.1",
21+
"@opentelemetry/exporter-prometheus": "^0.202.0",
2222
"axios": "^1.3.3",
2323
"co": "^4.6.0",
2424
"express": "^5.1.0",

components/runtimes/nodejs/nodejs22/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
},
1111
"dependencies": {
1212
"@opentelemetry/api": "^1.9.0",
13-
"@opentelemetry/exporter-trace-otlp-http": "^0.201.1",
14-
"@opentelemetry/instrumentation": "^0.201.1",
15-
"@opentelemetry/instrumentation-express": "^0.50.0",
16-
"@opentelemetry/instrumentation-http": "^0.201.1",
13+
"@opentelemetry/exporter-trace-otlp-http": "^0.202.0",
14+
"@opentelemetry/instrumentation": "^0.202.0",
15+
"@opentelemetry/instrumentation-express": "^0.51.0",
16+
"@opentelemetry/instrumentation-http": "^0.202.0",
1717
"@opentelemetry/propagator-b3": "^2.0.1",
1818
"@opentelemetry/sdk-trace-node": "^2.0.1",
1919
"@opentelemetry/sdk-trace-base": "^2.0.1",
2020
"@opentelemetry/sdk-metrics": "^2.0.1",
21-
"@opentelemetry/exporter-prometheus": "^0.201.1",
21+
"@opentelemetry/exporter-prometheus": "^0.202.0",
2222
"axios": "^1.3.3",
2323
"co": "^4.6.0",
2424
"express": "^5.1.0",

components/runtimes/python/python312/requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ bottle==0.13.3
44
cheroot==10.0.1
55
wsgi-request-logger==0.4.6
66
prometheus_client==0.22.1
7-
opentelemetry-api==1.33.1
8-
opentelemetry-sdk==1.33.1
9-
opentelemetry-exporter-otlp-proto-http==1.33.1
10-
opentelemetry-propagator-b3==1.33.1
11-
opentelemetry-instrumentation-requests==0.54b1
7+
opentelemetry-api==1.34.0
8+
opentelemetry-sdk==1.34.0
9+
opentelemetry-exporter-otlp-proto-http==1.34.0
10+
opentelemetry-propagator-b3==1.34.0
11+
opentelemetry-instrumentation-requests==0.55b0
1212
cloudevents

components/serverless/deploy/jobinit/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.3-alpine3.21 as builder
1+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.4-alpine3.22 AS builder
22

33
ENV BASE_APP_DIR=/workspace/go/src/github.com/kyma-project/serverless \
44
CGO_ENABLED=1 \

components/serverless/deploy/manager/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.3-alpine3.21 as builder
1+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.4-alpine3.22 AS builder
22

33
ENV BASE_APP_DIR=/workspace/go/src/github.com/kyma-project/serverless \
44
CGO_ENABLED=1 \

components/serverless/deploy/webhook/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.3-alpine3.21 as builder
1+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.24.4-alpine3.22 AS builder
22

33
ENV BASE_APP_DIR=/workspace/go/src/github.com/kyma-project/serverless \
44
CGO_ENABLED=0 \
@@ -16,7 +16,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o webhook-server ./compon
1616
&& mv ./webhook-server /app/webhook-server
1717

1818
# get latest CA certs from alpine:3.17.4
19-
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.21.3 as certs
19+
FROM europe-docker.pkg.dev/kyma-project/prod/external/library/alpine:3.22.0 as certs
2020
RUN apk add --no-cache ca-certificates
2121

2222
FROM scratch

0 commit comments

Comments
 (0)