Skip to content

Commit 677596d

Browse files
authored
fix: only setup arc for linux + set env variable for windows correctly (#1049)
[comment]: # (Note that your PR title should follow the conventional commit format: https://conventionalcommits.org/en/v1.0.0/#summary) # PR Description [comment]: # (The below checklist is for PRs adding new features. If a box is not checked, add a reason why it's not needed.) # New Feature Checklist - [ ] List telemetry added about the feature. - [ ] Link to the one-pager about the feature. - [ ] List any tasks necessary for release (3P docs, AKS RP chart changes, etc.) after merging the PR. - [ ] Attach results of scale and perf testing. [comment]: # (The below checklist is for code changes. Not all boxes necessarily need to be checked. Build, doc, and template changes do not need to fill out the checklist.) # Tests Checklist - [ ] Have end-to-end Ginkgo tests been run on your cluster and passed? To bootstrap your cluster to run the tests, follow [these instructions](/otelcollector/test/README.md#bootstrap-a-dev-cluster-to-run-ginkgo-tests). - Labels used when running the tests on your cluster: - [ ] `operator` - [ ] `windows` - [ ] `arm64` - [ ] `arc-extension` - [ ] `fips` - [ ] Have new tests been added? For features, have tests been added for this feature? For fixes, is there a test that could have caught this issue and could validate that the fix works? - [ ] Is a new scrape job needed? - [ ] The scrape job was added to the folder [test-cluster-yamls](/otelcollector/test/test-cluster-yamls/) in the correct configmap or as a CR. - [ ] Was a new test label added? - [ ] A string constant for the label was added to [constants.go](/otelcollector/test/utils/constants.go). - [ ] The label and description was added to the [test README](/otelcollector/test/README.md). - [ ] The label was added to this [PR checklist](/.github/pull_request_template). - [ ] The label was added as needed to [testkube-test-crs.yaml](/otelcollector/test/testkube/testkube-test-crs.yaml). - [ ] Are additional API server permissions needed for the new tests? - [ ] These permissions have been added to [api-server-permissions.yaml](/otelcollector/test/testkube/api-server-permissions.yaml). - [ ] Was a new test suite (a new folder under `/tests`) added? - [ ] The new test suite is included in [testkube-test-crs.yaml](/otelcollector/test/testkube/testkube-test-crs.yaml).
1 parent 757d2d1 commit 677596d

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

otelcollector/main/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func main() {
5656
shared.StartCommand("powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", "C:\\opt\\scripts\\filesystemwatcher.ps1")
5757
}
5858

59-
if ccpMetricsEnabled != "true" {
59+
if ccpMetricsEnabled != "true" && osType == "linux" {
6060
if err := shared.SetupArcEnvironment(); err != nil {
6161
shared.EchoError(err.Error())
6262
}

otelcollector/shared/configmap/mp/configmapparser.go

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bufio"
55
"fmt"
66
"os"
7-
"os/exec"
87
"strings"
98

109
"github.com/prometheus-collector/shared"
@@ -239,18 +238,17 @@ func Configmapparser() {
239238
}
240239

241240
// Source prom_config_validator_env_var
242-
cmd := exec.Command("bash", "-c", "source /opt/microsoft/prom_config_validator_env_var && env")
243-
if err := cmd.Run(); err != nil {
244-
shared.EchoError("Error sourcing env file:" + err.Error())
245-
return
246-
}
247-
248-
// Source envvars.env
249-
cmd = exec.Command("bash", "-c", "source /opt/envvars.env && env")
250-
if err := cmd.Run(); err != nil {
251-
shared.EchoError("Error sourcing envvars.env:" + err.Error())
252-
return
253-
}
241+
filename := "/opt/microsoft/prom_config_validator_env_var"
242+
err = shared.SetEnvVarsFromFile(filename)
243+
if err != nil {
244+
fmt.Printf("Error when settinng env for /opt/microsoft/prom_config_validator_env_var: %v\n", err)
245+
}
246+
247+
filename = "/opt/envvars.env"
248+
err = shared.SetEnvVarsFromFile(filename)
249+
if err != nil {
250+
fmt.Printf("Error when settinng env for /opt/envvars.env: %v\n", err)
251+
}
254252
}
255253

256254
fmt.Printf("prom-config-validator::Use default prometheus config: %s\n", os.Getenv("AZMON_USE_DEFAULT_PROMETHEUS_CONFIG"))

0 commit comments

Comments
 (0)