Skip to content

Commit 00dba07

Browse files
k8s-infra-cherrypick-robotmatthias-haase
authored andcommitted
NGINX: Bump OpenTelemetry. (kubernetes#12631)
Co-authored-by: matthias-haase <matthias.haase.fulda@gmx.de>
1 parent d6705cf commit 00dba07

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

images/nginx/rootfs/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ RUN apk update \
5151
tzdata \
5252
grpc-cpp \
5353
libprotobuf \
54+
abseil-cpp-crc-cpu-detect \
55+
abseil-cpp-vlog-config-internal \
5456
&& ln -s /usr/local/nginx/sbin/nginx /sbin/nginx \
5557
&& adduser -S -D -H -u 101 -h /usr/local/nginx \
5658
-s /sbin/nologin -G www-data -g www-data www-data \

images/nginx/rootfs/build.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,14 @@ export LUA_RESTY_REDIS_VERSION=8641b9f1b6f75cca50c90cf8ca5c502ad8950aa8
9898
# Check for recent changes: https://github.com/api7/lua-resty-ipmatcher/compare/v0.6.1...master
9999
export LUA_RESTY_IPMATCHER_VERSION=3e93c53eb8c9884efe939ef070486a0e507cc5be
100100

101-
# Check for recent changes: https://github.com/microsoft/mimalloc/compare/v2.1.7...master
101+
# Check for recent changes: https://github.com/microsoft/mimalloc/compare/v2.1.7...master
102102
export MIMALOC_VERSION=v2.1.7
103103

104-
# Check on https://github.com/open-telemetry/opentelemetry-cpp
105-
export OPENTELEMETRY_CPP_VERSION="v1.11.0"
106-
# Check on https://github.com/open-telemetry/opentelemetry-proto
107-
export OPENTELEMETRY_PROTO_VERSION="v1.1.0"
104+
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp/compare/v1.18.0...main
105+
export OPENTELEMETRY_CPP_VERSION="v1.18.0"
106+
107+
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-proto/compare/v1.5.0...main
108+
export OPENTELEMETRY_PROTO_VERSION="v1.5.0"
108109

109110
export BUILD_PATH=/tmp/build
110111

@@ -527,7 +528,8 @@ make
527528
make modules
528529
make install
529530

530-
export OPENTELEMETRY_CONTRIB_COMMIT=e11348bb400d5472bf1da5d6128bead66fa111ff
531+
# Check for recent changes: https://github.com/open-telemetry/opentelemetry-cpp-contrib/compare/8933841f0a7f8737f61404cf0a64acf6b079c8a5...main
532+
export OPENTELEMETRY_CONTRIB_COMMIT=8933841f0a7f8737f61404cf0a64acf6b079c8a5
531533
cd "$BUILD_PATH"
532534

533535
git clone https://github.com/open-telemetry/opentelemetry-cpp-contrib.git opentelemetry-cpp-contrib-${OPENTELEMETRY_CONTRIB_COMMIT}

0 commit comments

Comments
 (0)