Skip to content

[nr-k8s-otel-collector] support openshift 4.20 #2115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamescripter wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[nr-k8s-otel-collector] support openshift 4.20 #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bc42da
use some specific configs for openshift
jamescripter Feb 12, 2026
2b66116
bump version
jamescripter Feb 12, 2026
c73d7b2
make generate-examples
jamescripter Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.10.5
version: 0.10.6


dependencies:
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
rules:
- apiGroups:
- ""
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
subjects:
- kind: ServiceAccount
name: nr-k8s-otel-collector
Expand Down
5 changes: 3 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
data:
daemonset-config.yaml: |
receivers:
Expand Down Expand Up @@ -79,6 +79,7 @@ data:
endpoint: "${KUBE_NODE_NAME}:10250"
auth_type: "serviceAccount"
insecure_skip_verify: true

metrics:
k8s.container.cpu_limit_utilization:
enabled: true
Expand Down Expand Up @@ -613,7 +614,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.5
value: 0.10.6
- key: newrelic.entity.type
action: upsert
value: "k8s"
Expand Down
4 changes: 2 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
spec:
selector:
matchLabels:
Expand All @@ -24,7 +24,7 @@ spec:
app.kubernetes.io/name: nr-k8s-otel-collector
component: daemonset
annotations:
checksum/config: 6c5ce1a6f82c834eb8b42383bd1fb5181cea24c7ccdbd725ce105076e2cb1094
checksum/config: 3f90249abc3aedecb08f47625dc168daf02f4a6a211e68284dde49f694267c43
spec:
serviceAccountName: nr-k8s-otel-collector
initContainers:
Expand Down
6 changes: 3 additions & 3 deletions charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
data:
deployment-config.yaml: |
receivers:
Expand Down Expand Up @@ -516,7 +516,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.5
value: 0.10.6
- key: newrelic.entity.type
action: upsert
value: "k8s"
Expand All @@ -534,7 +534,7 @@ data:
value: <cluser_name>
- key: "newrelic.chart.version"
action: upsert
value: 0.10.5
value: 0.10.6

transform/events:
log_statements:
Expand Down
4 changes: 2 additions & 2 deletions charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
spec:
replicas: 1
minReadySeconds: 5
Expand All @@ -26,7 +26,7 @@ spec:
app.kubernetes.io/name: nr-k8s-otel-collector
component: deployment
annotations:
checksum/config: cdcda6b0e1e1481ee0d0ee12c277157e965d9a3c2452b4e275e8c13fb218aa59
checksum/config: be5bf4d6035b12332ac247fe0abe03458c351fbb2a6f06e91854c8c9b227873e
spec:
serviceAccountName: nr-k8s-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
data:
licenseKey: PE5SX2xpY2Vuc2VLZXk+
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
spec:
type: ClusterIP
ports:
Expand Down
2 changes: 1 addition & 1 deletion charts/nr-k8s-otel-collector/examples/k8s/rendered/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: nr-k8s-otel-collector
app.kubernetes.io/version: 1.2.0
helm.sh/chart: nr-k8s-otel-collector-0.10.5
helm.sh/chart: nr-k8s-otel-collector-0.10.6
annotations:
14 changes: 11 additions & 3 deletions charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data:
{{- include "nrKubernetesOtel.daemonset.configMap.extraConfig.receivers" . | nindent 6 }}
hostmetrics:
# TODO (chris): this is a linux specific configuration
{{- if not (include "newrelic.common.gkeAutopilot" .) }}
{{- if not (or (include "newrelic.common.gkeAutopilot" .) (include "newrelic.common.openShift" .)) }}
root_path: /hostfs
{{- end }}
collection_interval: {{ .Values.receivers.hostmetrics.scrapeInterval }}
Expand Down Expand Up @@ -77,14 +77,22 @@ data:

kubeletstats:
collection_interval: {{ .Values.receivers.kubeletstats.scrapeInterval }}
{{- if not (include "newrelic.common.gkeAutopilot" .) }}

{{- if include "newrelic.common.openShift" . }}
endpoint: "${HOST_IP}:10250"
{{- else if not (include "newrelic.common.gkeAutopilot" .) }}
endpoint: "${KUBE_NODE_NAME}:10250"
{{- else }}
endpoint: "${KUBE_NODE_NAME}:10255"
{{- end }}

{{- if not (include "newrelic.common.gkeAutopilot" .) }}
auth_type: "serviceAccount"
insecure_skip_verify: true
{{- else }}
endpoint: "${KUBE_NODE_NAME}:10255"
auth_type: "none"
{{- end }}

metrics:
k8s.container.cpu_limit_utilization:
enabled: true
Expand Down
Loading