Skip to content

Commit 98c50b2

Browse files
jamescripterjamescripter
committed
Merge remote-tracking branch 'origin/master' into fix/remove-filters-dropping-critical-cpu-memory-and-k8s-state-metrics
2 parents ef28e19 + 14a36dd commit 98c50b2

28 files changed

+141
-75
lines changed

‎.github/workflows/lint_test_charts.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
fetch-depth: 0
3030

31-
- uses: actions/setup-python@v5
31+
- uses: actions/setup-python@v6
3232
- uses: helm/chart-testing-action@v2.8.0
3333
- uses: azure/setup-helm@v4
3434
with:
@@ -73,7 +73,7 @@ jobs:
7373
with:
7474
fetch-depth: 0
7575

76-
- uses: actions/setup-python@v5
76+
- uses: actions/setup-python@v6
7777
- uses: helm/chart-testing-action@v2.8.0
7878
- uses: azure/setup-helm@v4
7979
with:

‎.github/workflows/repolinter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Test Default Branch
1717
id: default-branch
18-
uses: actions/github-script@v7.1.0
18+
uses: actions/github-script@v8.0.0
1919
with:
2020
script: |
2121
const data = await github.rest.repos.get(context.repo)

‎.github/workflows/security.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
output: 'trivy-results.sarif'
3535

3636
- name: Upload Trivy scan results to GitHub Security tab
37-
uses: github/codeql-action/upload-sarif@v3
37+
uses: github/codeql-action/upload-sarif@v4
3838
if: ${{ github.event.schedule }} # Upload sarif when running periodically
3939
with:
4040
sarif_file: 'trivy-results.sarif'

‎charts/newrelic-logging/Chart.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
apiVersion: v2
22
description: A Helm chart to deploy New Relic Kubernetes Logging as a DaemonSet, supporting both Linux and Windows nodes and containers
33
name: newrelic-logging
4-
version: 1.33.1
4+
version: 1.34.0
55
appVersion: 3.2.1
66
home: https://github.com/newrelic/kubernetes-logging
77
icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg
88
maintainers:
99
- name: jsubirat
1010
email: logging-team@newrelic.com
1111
- name: danybmx
12-
- name: sdaubin
1312
keywords:
1413
- logging
1514
- newrelic

‎charts/newrelic-logging/README.md‎

Lines changed: 10 additions & 10 deletions
Large diffs are not rendered by default.

‎charts/newrelic-logging/templates/_helpers.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,9 @@ If additionalEnvVariables is set, renames to extraEnv. Returns extraEnv.
277277
{{- define "newrelic-logging.extraEnv" -}}
278278
{{- if .Values.fluentBit }}
279279
{{- if .Values.fluentBit.additionalEnvVariables }}
280-
{{- toYaml .Values.fluentBit.additionalEnvVariables -}}
280+
{{- tpl (toYaml .Values.fluentBit.additionalEnvVariables) . -}}
281281
{{- else if .Values.fluentBit.extraEnv }}
282-
{{- toYaml .Values.fluentBit.extraEnv -}}
282+
{{- tpl (toYaml .Values.fluentBit.extraEnv) . -}}
283283
{{- end -}}
284284
{{- end -}}
285285
{{- end -}}

‎charts/newrelic-logging/tests/extra_env_test.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
suite: test extra environment settings
2+
templates:
3+
- templates/configmap.yaml
4+
- templates/daemonset.yaml
5+
- templates/daemonset-windows.yaml
6+
release:
7+
name: extra-env-release
8+
namespace: extra-env-namespace
9+
tests:
10+
- it: should instantiate daemonset with static and templatized extra environment variables when using fluentBit.extraEnv
11+
templates:
12+
- templates/daemonset.yaml
13+
- templates/daemonset-windows.yaml
14+
set:
15+
licenseKey: need_to_specify_this_otherwise_templates_wont_render
16+
someConfigurationKey: "someConfigurationValue"
17+
fluentBit:
18+
extraEnv:
19+
- name: EXTRA_ENV_VAR
20+
value: "extra_env_value"
21+
- name: EXTRA_ENV_VAR_WITH_TEMPLATE
22+
value: "should read from someConfigurationKey: {{ .Values.someConfigurationKey }}"
23+
enableWindows: true
24+
asserts:
25+
- contains:
26+
path: spec.template.spec.containers[0].env
27+
content:
28+
name: EXTRA_ENV_VAR
29+
value: "extra_env_value"
30+
- contains:
31+
path: spec.template.spec.containers[0].env
32+
content:
33+
name: EXTRA_ENV_VAR_WITH_TEMPLATE
34+
value: "should read from someConfigurationKey: someConfigurationValue"
35+
- it: should instantiate daemonset with static and templatized extra environment variables when using fluentBit.additionalEnvVariables
36+
templates:
37+
- templates/daemonset.yaml
38+
- templates/daemonset-windows.yaml
39+
set:
40+
licenseKey: need_to_specify_this_otherwise_templates_wont_render
41+
someConfigurationKey: "someConfigurationValue"
42+
fluentBit:
43+
additionalEnvVariables:
44+
- name: EXTRA_ENV_VAR
45+
value: "extra_env_value"
46+
- name: EXTRA_ENV_VAR_WITH_TEMPLATE
47+
value: "should read from someConfigurationKey: {{ .Values.someConfigurationKey }}"
48+
enableWindows: true
49+
asserts:
50+
- contains:
51+
path: spec.template.spec.containers[0].env
52+
content:
53+
name: EXTRA_ENV_VAR
54+
value: "extra_env_value"
55+
- contains:
56+
path: spec.template.spec.containers[0].env
57+
content:
58+
name: EXTRA_ENV_VAR_WITH_TEMPLATE
59+
value: "should read from someConfigurationKey: someConfigurationValue"

‎charts/newrelic-logging/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ fluentBit:
5656
# valueFrom:
5757
# fieldRef:
5858
# fieldPath: metadata.name
59+
# Helm templating is also supported
60+
# - name: MY_TEMPLATIZED_ENV
61+
# value: "templatization example {{ .Values.someValue }}"
5962

6063
# Indicates how fluent-bit database is persisted
6164
persistence:

‎charts/nr-ebpf-agent/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type: application
1313
# This is the chart version. This version number should be incremented each time you make changes
1414
# to the chart and its templates, including the app version.
1515
# Versions are expected to follow Semantic Versioning (https://semver.org/)
16-
version: 1.2.0
16+
version: 1.2.1
1717

1818
dependencies:
1919
- name: common-library
@@ -23,7 +23,7 @@ dependencies:
2323
# incremented each time you make changes to the application. Versions are not expected to
2424
# follow Semantic Versioning. They should reflect the version the application is using.
2525
# It is recommended to use it with quotes.
26-
appVersion: "1.2.0"
26+
appVersion: "1.2.1"
2727
home: https://github.com/newrelic/helm-charts
2828
sources:
2929
- https://github.com/newrelic/

‎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.9.11
20+
version: 0.10.2
2121

2222

2323
dependencies:

0 commit comments

Comments
 (0)