DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NGINX: Bump OpenTelemetry. (#12631)

Browse source 
Co-authored-by: matthias-haase <matthias.haase.fulda@gmx.de>
This commit is contained in:
k8s-infra-cherrypick-robot 2025-01-06 14:00:30 -08:00 committed by GitHub
parent c635bb6eec
commit 54a76f2d80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/nginx/rootfs/Dockerfile
View file

@ -51,6 +51,8 @@ RUN apk update \
tzdata \ tzdata \
grpc-cpp \ grpc-cpp \
libprotobuf \ libprotobuf \
abseil-cpp-crc-cpu-detect \
abseil-cpp-vlog-config-internal \
&& ln -s /usr/local/nginx/sbin/nginx /sbin/nginx \ && ln -s /usr/local/nginx/sbin/nginx /sbin/nginx \
&& adduser -S -D -H -u 101 -h /usr/local/nginx \ && adduser -S -D -H -u 101 -h /usr/local/nginx \
-s /sbin/nologin -G www-data -g www-data www-data \ -s /sbin/nologin -G www-data -g www-data www-data \

12
images/nginx/rootfs/build.sh
View file

@ -101,10 +101,11 @@ export LUA_RESTY_IPMATCHER_VERSION=3e93c53eb8c9884efe939ef070486a0e507cc5be
# Check for recent changes: https://github.com/microsoft/mimalloc/compare/v2.1.7...master # Check for recent changes: https://github.com/microsoft/mimalloc/compare/v2.1.7...master
export MIMALOC_VERSION=v2.1.7 export MIMALOC_VERSION=v2.1.7
# Check on https://github.com/open-telemetry/opentelemetry-cpp # Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp/compare/v1.18.0...main
export OPENTELEMETRY_CPP_VERSION="v1.11.0" export OPENTELEMETRY_CPP_VERSION="v1.18.0"
# Check on https://github.com/open-telemetry/opentelemetry-proto
export OPENTELEMETRY_PROTO_VERSION="v1.1.0" # Check for recent changes: https://github.com/open-telemetry/opentelemetry-proto/compare/v1.5.0...main
export OPENTELEMETRY_PROTO_VERSION="v1.5.0"
export BUILD_PATH=/tmp/build export BUILD_PATH=/tmp/build
@ -527,7 +528,8 @@ make
make modules make modules
make install make install
export OPENTELEMETRY_CONTRIB_COMMIT=e11348bb400d5472bf1da5d6128bead66fa111ff # Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp-contrib/compare/8933841f0a7f8737f61404cf0a64acf6b079c8a5...main
export OPENTELEMETRY_CONTRIB_COMMIT=8933841f0a7f8737f61404cf0a64acf6b079c8a5
cd "$BUILD_PATH" cd "$BUILD_PATH"
git clone https://github.com/open-telemetry/opentelemetry-cpp-contrib.git opentelemetry-cpp-contrib-${OPENTELEMETRY_CONTRIB_COMMIT} git clone https://github.com/open-telemetry/opentelemetry-cpp-contrib.git opentelemetry-cpp-contrib-${OPENTELEMETRY_CONTRIB_COMMIT}