Skip to content

Commit fe0e057

Browse files
author
Israel Blancas
authored
Merge branch 'main' into 3155
2 parents b64ed2c + 22e8c06 commit fe0e057

File tree

6 files changed

+46
-16
lines changed

6 files changed

+46
-16
lines changed

.chloggen/ta-no-root.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
5+
component: target allocator
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Change docker image to run as non-root
9+
10+
# One or more tracking issues related to the change
11+
issues: [3378]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

.github/CODEOWNERS

-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,3 @@
1717

1818
# AutoInstrumentation owners
1919
# TBD
20-
21-
# Target Allocator owners
22-
cmd/otel-allocator @open-telemetry/operator-ta-maintainers

README.md

-9
Original file line numberDiff line numberDiff line change
@@ -860,15 +860,6 @@ Emeritus Approvers:
860860
- [Owais Lone](https://github.com/owais), Splunk
861861
- [Pablo Baeyens](https://github.com/mx-psi), DataDog
862862

863-
Target Allocator Maintainers ([@open-telemetry/operator-ta-maintainers](https://github.com/orgs/open-telemetry/teams/operator-ta-maintainers)):
864-
865-
- [Sebastian Poxhofer](https://github.com/secustor)
866-
867-
Emeritus Target Allocator Maintainers
868-
869-
- [Anthony Mirabella](https://github.com/Aneurysm9), AWS
870-
- [Kristina Pathak](https://github.com/kristinapathak), Lightstep
871-
872863
Maintainers ([@open-telemetry/operator-maintainers](https://github.com/orgs/open-telemetry/teams/operator-maintainers)):
873864

874865
- [Jacob Aronoff](https://github.com/jaronoff97), Lightstep

cmd/otel-allocator/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get CA certificates from the Alpine package repo
2-
FROM alpine:3.20 as certificates
2+
FROM alpine:3.20 AS certificates
33

44
RUN apk --no-cache add ca-certificates
55

@@ -8,12 +8,14 @@ FROM scratch
88

99
ARG TARGETARCH
1010

11-
WORKDIR /root/
11+
WORKDIR /
1212

1313
# Copy the certs
1414
COPY --from=certificates /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
1515

1616
# Copy binary built on the host
1717
COPY bin/targetallocator_${TARGETARCH} ./main
1818

19+
USER 65532:65532
20+
1921
ENTRYPOINT ["./main"]

tests/e2e-openshift/monitoring/chainsaw-test.yaml

+25-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
21
apiVersion: chainsaw.kyverno.io/v1alpha1
32
kind: Test
43
metadata:
@@ -14,6 +13,31 @@ spec:
1413
file: 00-workload-monitoring.yaml
1514
- assert:
1615
file: 00-assert.yaml
16+
- name: Enable OpenShift platform monitoring on the OpenTelemetry operator namespace
17+
try:
18+
- command:
19+
entrypoint: oc
20+
args:
21+
- get
22+
- pods
23+
- -A
24+
- -l control-plane=controller-manager
25+
- -l app.kubernetes.io/name=opentelemetry-operator
26+
- -o
27+
- jsonpath={.items[0].metadata.namespace}
28+
outputs:
29+
- name: OTEL_NAMESPACE
30+
value: ($stdout)
31+
- command:
32+
env:
33+
- name: otelnamespace
34+
value: ($OTEL_NAMESPACE)
35+
entrypoint: oc
36+
args:
37+
- label
38+
- namespace
39+
- $otelnamespace
40+
- openshift.io/cluster-monitoring=true
1741
- name: step-01
1842
try:
1943
- apply:

tests/e2e-openshift/monitoring/check_metrics.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TOKEN=$(oc create token prometheus-user-workload -n openshift-user-workload-moni
44
THANOS_QUERIER_HOST=$(oc get route thanos-querier -n openshift-monitoring -o json | jq -r '.spec.host')
55

66
#Check metrics for OpenTelemetry collector instance.
7-
metrics="otelcol_process_uptime otelcol_process_runtime_total_sys_memory_bytes otelcol_process_memory_rss otelcol_exporter_sent_spans otelcol_process_cpu_seconds otelcol_process_memory_rss otelcol_process_runtime_heap_alloc_bytes otelcol_process_runtime_total_alloc_bytes otelcol_process_runtime_total_sys_memory_bytes otelcol_process_uptime otelcol_receiver_accepted_spans otelcol_receiver_refused_spans"
7+
metrics="otelcol_process_uptime otelcol_process_runtime_total_sys_memory_bytes otelcol_process_memory_rss otelcol_exporter_sent_spans otelcol_process_cpu_seconds otelcol_process_memory_rss otelcol_process_runtime_heap_alloc_bytes otelcol_process_runtime_total_alloc_bytes otelcol_process_runtime_total_sys_memory_bytes otelcol_process_uptime otelcol_receiver_accepted_spans otelcol_receiver_refused_spans opentelemetry_collector_info opentelemetry_collector_exporters opentelemetry_collector_receivers"
88

99
for metric in $metrics; do
1010
query="$metric"

0 commit comments

Comments
 (0)