Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/agent-control-bootstrap/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: agent-control-bootstrap
description: Bootstraps New Relic' Agent Control

type: application
version: 1.0.7
version: 1.0.8
# agent-control-deployment chart default version.
appVersion: 1.0.6
annotations:
Expand Down
2 changes: 1 addition & 1 deletion charts/agent-control-bootstrap/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ overrides:
{{- if .Values.agentControlCd.enabled -}}
{{- $config = mustMergeOverwrite $config (dict "config" (dict "cdReleaseName" .Values.agentControlCd.releaseName)) -}}
{{- else -}}
{{- $config = mustMergeOverwrite $config (dict "config" (dict "cdRemoteUpdate" false)) -}}
{{- $config = mustMergeOverwrite $config (dict "config" (dict "cdRemoteUpdate" false "cdReleaseName" "")) -}}
{{- end -}}

{{- $config | toYaml | b64enc -}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tests:
cdReleaseName: agent-control-cd
subAgentsNamespace: newrelic

- it: should set cdRemoteUpdate as false when agentControlCd is disabled
- it: should set cdRemoteUpdate as false and cdReleaseName as empty when agentControlCd is disabled
set:
agentControlCd:
enabled: false
Expand All @@ -25,15 +25,17 @@ tests:
path: data["agent-control-deployment.yaml"]
value: |-
config:
cdReleaseName: ""
cdRemoteUpdate: false
subAgentsNamespace: newrelic

- it: should override cdRemoteUpdate when agentControlCd is disabled
- it: should override cdRemoteUpdate and cdReleaseName when agentControlCd is disabled
set:
agentControlDeployment:
chartValues:
config:
cdRemoteUpdate: true
cdReleaseName: "name-to-override"
extraNestedValues: unchanged
extraValues: unchanged
agentControlCd:
Expand All @@ -45,6 +47,7 @@ tests:
path: data["agent-control-deployment.yaml"]
value: |-
config:
cdReleaseName: ""
cdRemoteUpdate: false
extraNestedValues: unchanged
extraValues: unchanged
Expand Down
Loading