Skip to content

Commit 8cf6c91

Browse files
authored
feat: add fleet_id environment variable to deployment configuration (#2053)
<!-- Thank you for contributing to New Relic's Helm charts. Before you submit this PR we'd like to make sure you are aware of our technical requirements: * https://github.com/newrelic-experimental/helm-charts/blob/master/CONTRIBUTING.md#technical-requirements For a quick overview across what we will look at reviewing your PR, please read our review guidelines: * https://github.com/newrelic-experimental/helm-charts/blob/master/REVIEW_GUIDELINES.md Following our best practices right from the start will accelerate the review process and help get your PR merged quicker. When updates to your PR are requested, please add new commits and do not squash the history. This will make it easier to identify new changes. The PR will be squashed anyways when it is merged. Thanks. For fast feedback, please @-mention maintainers that are listed in the Chart.yaml file. Please make sure you test your changes before you push them. Once pushed, a Github Action will run across your changes and do some initial checks and linting. These checks run very quickly. Please check the results. We would like these checks to pass before we even continue reviewing your changes. --> #### What this PR does / why we need it: #### Which issue this PR fixes *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)* - fixes # #### Special notes for your reviewer: #### Checklist [Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.] - [ ] Chart Version bumped - [ ] Variables are documented in the README.md - [ ] Title of the PR starts with chart name (e.g. `[mychartname]`) # Release Notes to Publish (nr-k8s-otel-collector) If this PR contains changes in `nr-k8s-otel-collector`, please complete the following section. All other charts should ignore this section. <!--BEGIN-RELEASE-NOTES--> ## 🚀 What's Changed * Tell the world about the latest changes in the chart. <!--END-RELEASE-NOTES-->
1 parent 5c6585e commit 8cf6c91

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apiVersion: v2
22
name: pipeline-control-gateway
33
type: application
4-
version: 2.1.0
4+
version: 2.2.0
55
dependencies:
66
- name: common-library
77
version: 1.4.0
88
repository: https://helm-charts.newrelic.com
9-
appVersion: "2.0.1"
9+
appVersion: "2.2.0"
1010
maintainers:
1111
- name: pipeline-control
1212
url: https://github.com/orgs/newrelic/teams/pcon/members

charts/pipeline-control-gateway/templates/deployment-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ data:
1919
{{- else }}
2020
# No configuration provided - please provide configuration via Values.generated
2121
{{- end }}
22-
{{- end }}
22+
{{- end }}

charts/pipeline-control-gateway/templates/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ spec:
8282
secretKeyRef:
8383
name: {{ include "newrelic.common.license.secretName" . }}
8484
key: {{ include "newrelic.common.license.secretKeyName" . }}
85+
- name: FLEET_ID
86+
value: "{{ .Values.fleet_id }}"
8587
{{- with .Values.deployment.envs }}
8688
{{- . | toYaml | nindent 12 }}
8789
{{- end }}

charts/pipeline-control-gateway/values.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ image:
2222
# -- The pull policy is defaulted to IfNotPresent, which skips pulling an image if it already exists. If pullPolicy is defined without a specific value, it is also set to Always.
2323
pullPolicy: IfNotPresent
2424
# -- Overrides the image tag whose default is the chart appVersion.
25-
tag: "2.0.1"
25+
tag: "2.2.0"
2626

2727
# -- Name of the Kubernetes cluster monitored. Mandatory. Can be configured also with `global.cluster`
2828
cluster: ""
@@ -133,6 +133,11 @@ verboseLog:
133133
# @default -- `false`
134134
nrStaging:
135135

136+
# -- The unique identifier for the gateway fleet associated with the Pipeline Control Gateway (PCG) agent. Can be configured also with `fleet_id`
137+
# @default -- `""`
138+
fleet_id: ""
139+
140+
136141
# -- (bool) Send only the [metrics required](https://github.com/newrelic/helm-charts/tree/master/charts/nr-k8s-otel-collector/docs/metrics-lowDataMode.md) to light up the NR kubernetes UI, this agent defaults to setting lowDataMode true, but if this setting is unset, lowDataMode will be set to false
137142
# @default -- `false`
138143
lowDataMode:
@@ -158,6 +163,7 @@ generated:
158163
path: "/health/config"
159164
receivers:
160165
nrproprietaryreceiver:
166+
fleet_id: ${env:FLEET_ID:-""}
161167
proxy: false
162168
enable_runtime_metrics: true
163169
server:

0 commit comments

Comments
 (0)