Skip to content

Commit

Permalink
fix: Stream OTel plugin with ingress nginx
Browse files Browse the repository at this point in the history
The plugin needs to be built with the version set to the exact version
of nginx shipped with the controller. Get rid of the standalone package
and build inline with ingress nginx

Signed-off-by: RJ Sampson <[email protected]>
  • Loading branch information
EyeCantCU committed Jan 15, 2025
1 parent 88b53ff commit a41eeed
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 116 deletions.
74 changes: 73 additions & 1 deletion ingress-nginx-controller-1.12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package:
name: ingress-nginx-controller-1.12
version: 1.12.0
# There are manual changes to review between each package update. See 'vars:' section.
epoch: 0
epoch: 1
description: "Ingress-NGINX Controller for Kubernetes"
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -54,6 +54,7 @@ var-transforms:
environment:
contents:
packages:
- abseil-cpp-dev
- autoconf
- automake
- bash
Expand All @@ -62,6 +63,7 @@ environment:
- busybox
- ca-certificates
- ca-certificates-bundle
- c-ares-dev
- clang-15
- cmake
- curl
Expand All @@ -72,7 +74,9 @@ environment:
- gcc
- gd-dev
- git
- glibc-dev
- go
- icu-dev
- libaio-dev
- libcap
- libcap-utils
Expand Down Expand Up @@ -111,13 +115,17 @@ environment:
- openssh-client
- openssl
- openssl-dev
- opentelemetry-cpp-dev
- patch
- pcre-dev
- perl-dev
- pkgconf
- protobuf-dev
- python3
- re2-dev
- scanelf
- ssdeep
- systemd-dev
- util-linux
- wget
- wolfi-base
Expand Down Expand Up @@ -149,6 +157,8 @@ vars:
# TODO: ModSecurity-nginx needs a release beyond v1.0.3 to work properly
# see https://github.com/owasp-modsecurity/ModSecurity-nginx/issues/324
MODSECURITY_NGINX_VERSION: "ef64996aedd4bb5fa1831631361244813d48b82f"
# Instrumentation for nginx plugin: https://github.com/open-telemetry/opentelemetry-cpp-contrib
OTEL_SHA: "a4d3681626082234abb71f118cb9be6e71fc52eb"

pipeline:
- uses: git-checkout
Expand Down Expand Up @@ -492,6 +502,7 @@ subpackages:
provides:
- ingress-nginx-controller-compat=${{package.full-version}}
runtime:
- ingress-nginx-opentelemetry-plugin-${{vars.nginx-ingress-major-minor}}
- modsecurity-config
pipeline:
- runs: |
Expand Down Expand Up @@ -535,6 +546,33 @@ subpackages:
modroot: ./images/kube-webhook-certgen/rootfs
packages: .

- name: ingress-nginx-opentelemetry-plugin-${{vars.nginx-ingress-major-minor}}
description: OTel plugin for ingress nginx controller ${{vars.nginx-ingress-major-minor}}
dependencies:
provides:
- ingress-nginx-opentelemetry-plugin=${{package.full-version}}
runtime:
- ingress-nginx-controller-${{vars.nginx-ingress-major-minor}}
pipeline:
- uses: git-checkout
with:
repository: https://github.com/open-telemetry/opentelemetry-cpp-contrib
branch: main
expected-commit: ${{vars.OTEL_SHA}}
- working-directory: instrumentation/nginx
runs: |
mkdir build
cd build
# This must be set to whatever ingress nginx is using
cmake -DNGINX_VERSION=${{vars.NGINX_VERSION}} ..
make
# Copy over plugin
mkdir -p ${{targets.contextdir}}/etc/nginx/modules
cp -p otel_ngx_module.so ${{targets.contextdir}}/etc/nginx/modules/
- uses: strip

update:
enabled: true
manual: true
Expand All @@ -544,6 +582,10 @@ update:
tag-filter: "controller-v1.12"

test:
environment:
contents:
packages:
- ingress-nginx-controller-commpat-${{vars.nginx-ingress-major-minor}}
pipeline:
- runs: |
/usr/bin/nginx -v
Expand All @@ -552,3 +594,33 @@ test:
nginx -h
nginx-dbg --help
nginx-ingress-controller --version
- runs: |
cat <<EOF > /etc/nginx/nginx.conf
load_module /etc/nginx/modules/otel_ngx_module.so;
http {
opentelemetry_service_name "nginx-proxy";
opentelemetry_otlp_traces_endpoint "http://collector:4318/v1/traces";
server {
listen 80;
server_name otel_example;
root /var/www/html;
location = / {
opentelemetry_operation_name my_example_backend;
opentelemetry_propagate;
proxy_pass http://localhost:3501/;
}
}
}
events {}
EOF
# Not sure why this isn't included in main package.
mkdir -p /var/lib/nginx/tmp/
adduser -D -H -s /sbin/nologin nginx
# -T: test the configuration file: nginx checks the configuration for correct syntax, and then tries to open files referred in the configuration.
# additionally dump configuration files to standard output (1.9.2).
- runs: nginx -T
115 changes: 0 additions & 115 deletions opentelemetry-plugin-nginx.yaml

This file was deleted.

0 comments on commit a41eeed

Please sign in to comment.