-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add DD_AGENT_IPC_* env vars This PR adds DD_AGENT_IPC_PORT and DD_AGENT_IPC_CONFIG_REFRESH_INTERVAL env vars in otel agent and core agent. It does not override them if they are added by the user. This is necessary for the otel-agent to pull the api key from core config in the case where backend secrets are used. * only add env vars to core agent if otel agent is enabled * update version * add test * move found logic to helpers * Don't consider user set env varts * fix test * update chart
- Loading branch information
Showing
7 changed files
with
93 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -117,8 +117,6 @@ false | |
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
|
|
||
|
|
||
| {{/* | ||
| Return secret name to be used based on provided values. | ||
| */}} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package datadog | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| appsv1 "k8s.io/api/apps/v1" | ||
|
|
||
| "github.com/DataDog/helm-charts/test/common" | ||
| ) | ||
|
|
||
| const ( | ||
| DDAgentIpcPort = "DD_AGENT_IPC_PORT" | ||
| DDAgentIpcConfigRefreshInterval = "DD_AGENT_IPC_CONFIG_REFRESH_INTERVAL" | ||
| ) | ||
|
|
||
| type ExpectedIpcEnv struct { | ||
| ipcPort string | ||
| ipcConfigRefreshInterval string | ||
| } | ||
|
|
||
| func Test_otelAgentConfigs(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| command common.HelmCommand | ||
| assertions func(t *testing.T, manifest string, expectedIpcEnv ExpectedIpcEnv) | ||
| expectedIpcEnv ExpectedIpcEnv | ||
| }{ | ||
| { | ||
| name: "no ipc provided", | ||
| command: common.HelmCommand{ | ||
| ReleaseName: "datadog", | ||
| ChartPath: "../../charts/datadog", | ||
| ShowOnly: []string{"templates/daemonset.yaml"}, | ||
| Values: []string{"../../charts/datadog/values.yaml"}, | ||
| Overrides: map[string]string{ | ||
| "datadog.apiKeyExistingSecret": "datadog-secret", | ||
| "datadog.appKeyExistingSecret": "datadog-secret", | ||
| "datadog.otelCollector.enabled": "true", | ||
| }, | ||
| }, | ||
| expectedIpcEnv: ExpectedIpcEnv{ | ||
| ipcPort: "5009", | ||
| ipcConfigRefreshInterval: "60", | ||
| }, | ||
| assertions: verifyOtelAgentEnvVars, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| manifest, err := common.RenderChart(t, tt.command) | ||
| assert.Nil(t, err, "couldn't render template") | ||
| tt.assertions(t, manifest, tt.expectedIpcEnv) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func verifyOtelAgentEnvVars(t *testing.T, manifest string, expectedIpcEnv ExpectedIpcEnv) { | ||
| var deployment appsv1.DaemonSet | ||
| common.Unmarshal(t, manifest, &deployment) | ||
| // otel agent | ||
| otelAgentContainer, ok := getContainer(t, deployment.Spec.Template.Spec.Containers, "otel-agent") | ||
| assert.True(t, ok) | ||
| coreEnvs := getEnvVarMap(otelAgentContainer.Env) | ||
| assert.Equal(t, expectedIpcEnv.ipcPort, coreEnvs[DDAgentIpcPort]) | ||
| assert.Equal(t, expectedIpcEnv.ipcConfigRefreshInterval, coreEnvs[DDAgentIpcConfigRefreshInterval]) | ||
|
|
||
| // core agent | ||
| coreAgentContainer, ok := getContainer(t, deployment.Spec.Template.Spec.Containers, "agent") | ||
| assert.True(t, ok) | ||
| coreEnvs = getEnvVarMap(coreAgentContainer.Env) | ||
| assert.Equal(t, expectedIpcEnv.ipcPort, coreEnvs[DDAgentIpcPort]) | ||
| assert.Equal(t, expectedIpcEnv.ipcConfigRefreshInterval, coreEnvs[DDAgentIpcConfigRefreshInterval]) | ||
| } |