Skip to content

Commit 86e44b7

Browse files
committed
chore: pulling latest changes from master
2 parents 0b1c33b + 7e63af2 commit 86e44b7

File tree

27 files changed

+409
-258
lines changed

27 files changed

+409
-258
lines changed

charts/agent-control-bootstrap/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: agent-control-bootstrap
33
description: Bootstraps New Relic' Agent Control
44

55
type: application
6-
version: 1.2.1
6+
version: 1.4.0
77
# agent-control-deployment chart default version.
8-
appVersion: 1.2.0
8+
appVersion: 1.4.0
99
annotations:
1010
# agent-control-cd chart default version.
1111
agentControlCdVersion: 1.0.0

charts/agent-control-bootstrap/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fullnameOverride: ""
77
toolkitImage:
88
registry:
99
repository: newrelic/newrelic-agent-control-cli
10-
tag: "1.7.1"
10+
tag: "1.9.0"
1111
pullPolicy: IfNotPresent
1212
# -- The secrets that are needed to pull images from a custom registry.
1313
pullSecrets: []

charts/agent-control-deployment/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: A Helm chart to install New Relic Agent Control on Kubernetes
44

55
type: application
66

7-
version: 1.2.1
8-
appVersion: "1.7.1"
7+
version: 1.4.0
8+
appVersion: "1.9.0"
99

1010
dependencies:
1111
- name: common-library

charts/agent-control-deployment/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ systemIdentity:
264264

265265
image:
266266
repository: newrelic/agent-control-system-identity-registration
267-
tag: "0.1.2"
267+
tag: "0.1.3"
268268
pullPolicy: IfNotPresent
269269

270270
# -- Configuration for the parent identity

charts/nr-k8s-otel-collector/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type: application
1717
# This is the chart version. This version number should be incremented each time you make changes
1818
# to the chart and its templates, including the app version.
1919
# Versions are expected to follow Semantic Versioning (https://semver.org/)
20-
version: 0.10.2
20+
version: 0.10.5
2121

2222

2323
dependencies:

charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app.kubernetes.io/managed-by: Helm
1010
app.kubernetes.io/name: nr-k8s-otel-collector
1111
app.kubernetes.io/version: 1.2.0
12-
helm.sh/chart: nr-k8s-otel-collector-0.10.2
12+
helm.sh/chart: nr-k8s-otel-collector-0.10.5
1313
rules:
1414
- apiGroups:
1515
- ""

charts/nr-k8s-otel-collector/examples/k8s/rendered/clusterrolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app.kubernetes.io/managed-by: Helm
1010
app.kubernetes.io/name: nr-k8s-otel-collector
1111
app.kubernetes.io/version: 1.2.0
12-
helm.sh/chart: nr-k8s-otel-collector-0.10.2
12+
helm.sh/chart: nr-k8s-otel-collector-0.10.5
1313
subjects:
1414
- kind: ServiceAccount
1515
name: nr-k8s-otel-collector

charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/name: nr-k8s-otel-collector
1212
app.kubernetes.io/version: 1.2.0
13-
helm.sh/chart: nr-k8s-otel-collector-0.10.2
13+
helm.sh/chart: nr-k8s-otel-collector-0.10.5
1414
data:
1515
daemonset-config.yaml: |
1616
receivers:
@@ -43,6 +43,12 @@ data:
4343
metrics:
4444
system.filesystem.utilization:
4545
enabled: true
46+
# Exclude container storage overlay mount to avoid permission errors when running as non-root
47+
# This is only relevant for CRI-O container runtime (used by OKE, OpenShift, etc.)
48+
exclude_mount_points:
49+
mount_points:
50+
- ^/var/lib/containers/storage/overlay$
51+
match_type: regexp
4652
disk:
4753
metrics:
4854
system.disk.merged:
@@ -597,7 +603,7 @@ data:
597603
value: <cluser_name>
598604
- key: "newrelic.chart.version"
599605
action: upsert
600-
value: 0.10.2
606+
value: 0.10.5
601607
- key: newrelic.entity.type
602608
action: upsert
603609
value: "k8s"

charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/name: nr-k8s-otel-collector
1212
app.kubernetes.io/version: 1.2.0
13-
helm.sh/chart: nr-k8s-otel-collector-0.10.2
13+
helm.sh/chart: nr-k8s-otel-collector-0.10.5
1414
spec:
1515
selector:
1616
matchLabels:
@@ -24,7 +24,7 @@ spec:
2424
app.kubernetes.io/name: nr-k8s-otel-collector
2525
component: daemonset
2626
annotations:
27-
checksum/config: 89ef0a8b0250cf2c7598198122bb1945b0d9788017f84ae808cb9eea1c73b5c5
27+
checksum/config: 6c5ce1a6f82c834eb8b42383bd1fb5181cea24c7ccdbd725ce105076e2cb1094
2828
spec:
2929
serviceAccountName: nr-k8s-otel-collector
3030
initContainers:
@@ -51,7 +51,13 @@ spec:
5151
export NODE_CPU_ALLOCATABLE=$(awk "BEGIN {print ${NODE_CPU_ALLOCATABLE%?} / 1000}")
5252
fi
5353
54-
export NODE_MEMORY_ALLOCATABLE=$(kubectl get node $NODE_NAME -o jsonpath='{.status.allocatable.memory}' | numfmt --from=auto)
54+
export NODE_MEMORY_ALLOCATABLE=$(kubectl get node $NODE_NAME -o jsonpath='{.status.allocatable.memory}' | awk '
55+
/Ki$/ {printf "%.0f\n", $1 * 1024; next}
56+
/Mi$/ {printf "%.0f\n", $1 * 1024^2; next}
57+
/Gi$/ {printf "%.0f\n", $1 * 1024^3; next}
58+
/m$/ {printf "%.0f\n", $1 / 1000; next}
59+
{print $1}
60+
')
5561
5662
if [[ -z "NODE_MEMORY_ALLOCATABLE" ]] || [[ "NODE_MEMORY_ALLOCATABLE" == "0" ]]; then
5763
echo "Could not retrieve Memory allocatable for node $NODE_NAME"

charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment-configmap.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/managed-by: Helm
1111
app.kubernetes.io/name: nr-k8s-otel-collector
1212
app.kubernetes.io/version: 1.2.0
13-
helm.sh/chart: nr-k8s-otel-collector-0.10.2
13+
helm.sh/chart: nr-k8s-otel-collector-0.10.5
1414
data:
1515
deployment-config.yaml: |
1616
receivers:
@@ -516,7 +516,7 @@ data:
516516
value: <cluser_name>
517517
- key: "newrelic.chart.version"
518518
action: upsert
519-
value: 0.10.2
519+
value: 0.10.5
520520
- key: newrelic.entity.type
521521
action: upsert
522522
value: "k8s"
@@ -534,7 +534,7 @@ data:
534534
value: <cluser_name>
535535
- key: "newrelic.chart.version"
536536
action: upsert
537-
value: 0.10.2
537+
value: 0.10.5
538538
539539
transform/events:
540540
log_statements:

0 commit comments

Comments
 (0)