Skip to content

Commit 87ccbc3

Browse files
kkhandelwal-nrkkhandelwal-nr
authored
Merge branch 'master' into kkhandelwal/rel-1-5-0
2 parents 020884f + f0ab282 commit 87ccbc3

36 files changed

Lines changed: 319 additions & 191 deletions

File tree

‎.github/workflows/post-release-agent-metadata.yml‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,60 @@ permissions:
66
on:
77
release:
88
types: [released]
9+
workflow_dispatch:
10+
inputs:
11+
release_tag:
12+
description: 'Release tag to simulate (e.g. pipeline-control-gateway-1.2.3)'
13+
required: true
914

1015
jobs:
1116
update-agent-metadata:
1217
name: Update metadata for ${{ matrix.chart }}
1318
runs-on: ubuntu-latest
19+
env:
20+
RELEASE_TAG: ${{ github.event.release.tag_name || github.event.inputs.release_tag }}
1421
strategy:
1522
matrix:
1623
include:
1724
- chart: nr-ebpf-agent
1825
agent-type: NReBPFAgent
1926
config-directory: charts/nr-ebpf-agent/.fleetControl
27+
monitoring-type: INFRA
28+
display-name: "New Relic eBPF Agent"
2029
- chart: nri-bundle
2130
agent-type: NRInfra
2231
config-directory: charts/nri-bundle/.fleetControl
32+
monitoring-type: INFRA
33+
display-name: "New Relic Infrastructure"
2334
- chart: nr-k8s-otel-collector
2435
agent-type: NRDOT
2536
config-directory: charts/nr-k8s-otel-collector/.fleetControl
37+
monitoring-type: INFRA
38+
display-name: "New Relic OpenTelemetry Collector"
2639
- chart: newrelic-logging
2740
agent-type: FluentBit
2841
config-directory: charts/newrelic-logging/.fleetControl
42+
monitoring-type: INFRA
43+
display-name: "Fluent Bit"
2944
- chart: pipeline-control-gateway
3045
agent-type: PipelineControlGateway
31-
config-directory: charts/pipeline-control-gateway/.fleetControl
46+
config-directory: charts/pipeline-control-gateway/.fleetControl/pipeline-control
47+
display-name: "Pipeline Control"
48+
- chart: pipeline-control-gateway
49+
agent-type: PipelineControlGatewayConfigMode
50+
config-directory: charts/pipeline-control-gateway/.fleetControl/pipeline-control-config-mode
51+
display-name: "Pipeline Control Gateway Config Mode"
3252
- chart: agent-control-deployment
3353
agent-type: NRAgentControl
3454
config-directory: charts/agent-control-deployment/.fleetControl
55+
display-name: "New Relic Agent Control"
3556
fail-fast: false
3657

3758
steps:
3859
- name: Check if release matches chart
3960
id: should-run
4061
run: |
41-
TAG="${{ github.event.release.tag_name }}"
62+
TAG="${{ env.RELEASE_TAG }}"
4263
CHART="${{ matrix.chart }}"
4364
if [[ "$TAG" == "$CHART-"* ]]; then
4465
echo "match=true" >> $GITHUB_OUTPUT
@@ -52,7 +73,7 @@ jobs:
5273
if: steps.should-run.outputs.match == 'true'
5374
uses: actions/checkout@v4
5475
with:
55-
ref: ${{ github.event.release.tag_name }}
76+
ref: ${{ env.RELEASE_TAG }}
5677

5778
- name: Extract version from release tag or values.yaml
5879
if: steps.should-run.outputs.match == 'true'
@@ -64,7 +85,7 @@ jobs:
6485
VERSION=$(yq '.image.tag' charts/${{ matrix.chart }}/values.yaml | tr -d '"')
6586
echo "Extracted version from '.image.tag' in values.yaml: $VERSION"
6687
else
67-
VERSION="${{ github.event.release.tag_name }}"
88+
VERSION="${{ env.RELEASE_TAG }}"
6889
VERSION="${VERSION#${{ matrix.chart }}-}"
6990
echo "Extracted version from tag: $VERSION"
7091
fi
@@ -91,6 +112,8 @@ jobs:
91112
newrelic-private-key: ${{ secrets.NEWRELIC_PRIVATE_KEY }}
92113
agent-type: ${{ matrix.agent-type }}
93114
version: ${{ steps.version.outputs.version }}
94-
git-ref: ${{ github.event.release.tag_name }}
115+
git-ref: ${{ env.RELEASE_TAG }}
95116
config-directory: ${{ matrix.config-directory }}
117+
monitoring-type: ${{ matrix.monitoring-type }}
118+
display-name: ${{ matrix.display-name }}
96119
apm-control-nr-license-key: ${{ secrets.APM_CONTROL_NR_LICENSE_KEY_STAGING }}

‎charts/agent-control-bootstrap/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: common-library
33
repository: https://helm-charts.newrelic.com
4-
version: 2.3.1
5-
digest: sha256:ff23c3a4c0a51e4de9d2015b09bad1fbe227741ef620c8646f14c09820623b20
6-
generated: "2026-06-18T12:51:39.202634884Z"
4+
version: 2.3.3
5+
digest: sha256:0b85ba8fc894ed0fd1832688a954efdaeb80df7c9fe60c225eb124db7fbd409c
6+
generated: "2026-07-07T11:21:44.91695304Z"

‎charts/agent-control-bootstrap/Chart.yaml‎

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

55
type: application
6-
version: 1.8.4
6+
version: 1.8.5
77
# renovate: chartName=agent-control-deployment
8-
appVersion: 1.7.9
8+
appVersion: 1.7.10
99
annotations:
1010
# renovate: chartName=agent-control-cd
1111
agentControlCdVersion: 1.0.0
1212

1313

1414
dependencies:
1515
- name: common-library
16-
version: 2.3.1
16+
version: 2.3.3
1717
repository: https://helm-charts.newrelic.com
1818

1919
keywords:

‎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.17.0"
10+
tag: "1.18.0"
1111
pullPolicy: IfNotPresent
1212
# -- The secrets that are needed to pull images from a custom registry.
1313
pullSecrets: []

‎charts/agent-control-deployment/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: common-library
33
repository: https://helm-charts.newrelic.com
4-
version: 2.3.1
5-
digest: sha256:ff23c3a4c0a51e4de9d2015b09bad1fbe227741ef620c8646f14c09820623b20
6-
generated: "2026-06-01T16:17:58.353494504Z"
4+
version: 2.3.3
5+
digest: sha256:0b85ba8fc894ed0fd1832688a954efdaeb80df7c9fe60c225eb124db7fbd409c
6+
generated: "2026-07-07T11:02:58.1890204Z"

‎charts/agent-control-deployment/Chart.yaml‎

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

55
type: application
66

7-
version: 1.7.9
7+
version: 1.7.10
88

99
dependencies:
1010
- name: common-library
11-
version: 2.3.1
11+
version: 2.3.3
1212
repository: https://helm-charts.newrelic.com
1313

1414
keywords:

‎charts/agent-control-deployment/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ subAgentsNamespace: "newrelic"
1919
image:
2020
registry:
2121
repository: newrelic/newrelic-agent-control
22-
tag: "1.17.0"
22+
tag: "1.18.0"
2323
pullPolicy: IfNotPresent
2424
# -- The secrets that are needed to pull images from a custom registry.
2525
pullSecrets: []
@@ -31,7 +31,7 @@ image:
3131
toolkitImage:
3232
registry:
3333
repository: newrelic/newrelic-agent-control-cli
34-
tag: "1.17.0"
34+
tag: "1.18.0"
3535
pullPolicy: IfNotPresent
3636
# -- The secrets that are needed to pull images from a custom registry.
3737
pullSecrets: []

‎charts/newrelic-logging/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: common-library
33
repository: https://helm-charts.newrelic.com
4-
version: 2.3.1
5-
digest: sha256:ff23c3a4c0a51e4de9d2015b09bad1fbe227741ef620c8646f14c09820623b20
6-
generated: "2026-06-10T12:12:55.184563+05:30"
4+
version: 2.3.3
5+
digest: sha256:0b85ba8fc894ed0fd1832688a954efdaeb80df7c9fe60c225eb124db7fbd409c
6+
generated: "2026-07-01T13:51:52.766749+05:30"

‎charts/newrelic-logging/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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.38.2
4+
version: 1.38.3
55
appVersion: 3.6.0
66
home: https://github.com/newrelic/kubernetes-logging
77
icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg
@@ -14,5 +14,5 @@ keywords:
1414
- newrelic
1515
dependencies:
1616
- name: common-library
17-
version: 2.3.1
17+
version: 2.3.3
1818
repository: "https://helm-charts.newrelic.com"

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,41 @@ tests:
106106
template: templates/daemonset-windows.yaml
107107

108108

109+
- it: selects FedRAMP (GOV) endpoints when global.fedramp.enabled is true
110+
set:
111+
licenseKey: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaFFFFNRAL
112+
global:
113+
fedramp:
114+
enabled: true
115+
enableWindows: true
116+
asserts:
117+
# Linux
118+
- contains:
119+
path: spec.template.spec.containers[0].env
120+
content:
121+
name: ENDPOINT
122+
value: "https://gov-log-api.newrelic.com/log/v1"
123+
template: templates/daemonset.yaml
124+
- contains:
125+
path: spec.template.spec.containers[0].env
126+
content:
127+
name: METRICS_HOST
128+
value: "gov-metric-api.newrelic.com"
129+
template: templates/daemonset.yaml
130+
# Windows
131+
- contains:
132+
path: spec.template.spec.containers[0].env
133+
content:
134+
name: ENDPOINT
135+
value: "https://gov-log-api.newrelic.com/log/v1"
136+
template: templates/daemonset-windows.yaml
137+
- contains:
138+
path: spec.template.spec.containers[0].env
139+
content:
140+
name: METRICS_HOST
141+
value: "gov-metric-api.newrelic.com"
142+
template: templates/daemonset-windows.yaml
143+
109144
- it: selects custom logs endpoint if provided
110145
set:
111146
licenseKey: euaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaFFFFNRAL

0 commit comments

Comments
 (0)