Skip to content

Commit 0b97104

Browse files
authored
fix(run-integration-test): Fix kustomize setup (#61)
1 parent ad3e997 commit 0b97104

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

run-integration-test/kustomize/bases/opentelemetry-collectors/container-log-scrape/opentelemetrycollector.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ spec:
120120
# - set(attributes["body"], body)
121121

122122
# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor
123-
attributes:
123+
resource:
124124
# This key exists so it can be easily extended in an overlay:
125-
actions: []
125+
attributes: []
126126

127127
resourcedetection/env:
128128
detectors: [env]
@@ -148,6 +148,6 @@ spec:
148148
logs:
149149
receivers: [filelog/varlogpods]
150150
# processors: [memory_limiter, batch]
151-
processors: [k8sattributes, resourcedetection/env, attributes]
151+
processors: [k8sattributes, resourcedetection/env, resource]
152152
# Enable configured exporters in the overlay
153153
exporters: []

run-integration-test/kustomize/bases/opentelemetry-collectors/kubernetes-events/opentelemetrycollector.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ spec:
3737
# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/attributesprocessor
3838
# These are attributes for the specific spans, log events, etc...
3939
# For higher level attributes see the "resource" attributes below.
40-
attributes:
41-
# This key exists so it can be easily extended in an overlay:
42-
actions: []
40+
# attributes:
41+
# # This key exists so it can be easily extended in an overlay:
42+
# actions: []
4343

4444
# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor
4545
# These are top level attributes about the application as a whole and not any specific event.
@@ -75,12 +75,12 @@ spec:
7575
logs:
7676
receivers: [k8s_events]
7777
# processors: [memory_limiter, batch]
78-
processors: [k8sattributes, resourcedetection/env, resource, attributes]
78+
processors: [k8sattributes, resourcedetection/env, resource]
7979
# Enable configured exporters in the overlay
8080
exporters: []
8181
metrics:
8282
receivers: [k8s_cluster]
8383
# processors: [memory_limiter, batch]
84-
processors: [k8sattributes, resourcedetection/env, resource, attributes]
84+
processors: [k8sattributes, resourcedetection/env, resource]
8585
# Enable configured exporters in the overlay
8686
exporters: []

run-integration-test/kustomize/bases/opentelemetry-collectors/kubernetes-objects/opentelemetrycollector.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ spec:
3535
# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/attributesprocessor
3636
# These are attributes for the specific spans, log events, etc...
3737
# For higher level attributes see the "resource" attributes below.
38-
attributes:
39-
# This key exists so it can be easily extended in an overlay:
40-
actions: []
38+
# attributes:
39+
# # This key exists so it can be easily extended in an overlay:
40+
# actions: []
4141

4242
# https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor
4343
# These are top level attributes about the application as a whole and not any specific event.
@@ -73,6 +73,6 @@ spec:
7373
logs:
7474
receivers: [k8sobjects]
7575
# processors: [memory_limiter, batch]
76-
processors: [k8sattributes, resourcedetection/env, resource, attributes]
76+
processors: [k8sattributes, resourcedetection/env, resource]
7777
# Enable configured exporters in the overlay
7878
exporters: []

run-integration-test/kustomize/overlays/replicated/kustomization.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ patches:
1414
- op: add
1515
path: /spec/config/exporters/otlp
1616
value:
17-
endpoint: otel-logs-source.nick.stackable.build
17+
endpoint: otel-logs-source.nick.stackable.build:443
1818
# tls:
1919
# insecure: true
2020
- op: add
@@ -29,26 +29,26 @@ patches:
2929
path: /spec/config/processors/resource/attributes/-
3030
value:
3131
action: upsert
32-
key: k8s.cluster.name
33-
value: ${env:KUBERNETES_CLUSTER_NAME}
32+
key: k8s.cluster.name
33+
value: ${env:KUBERNETES_CLUSTER_NAME}
3434
- op: add
3535
path: /spec/config/processors/resource/attributes/-
3636
value:
3737
action: upsert
38-
key: k8s.cluster.distribution
39-
value: ${env:KUBERNETES_DISTRIBUTION}
38+
key: k8s.cluster.distribution
39+
value: ${env:KUBERNETES_DISTRIBUTION}
4040
- op: add
4141
path: /spec/config/processors/resource/attributes/-
4242
value:
4343
action: upsert
44-
key: k8s.cluster.version
45-
value: ${env:KUBERNETES_VERSION}
44+
key: k8s.cluster.version
45+
value: ${env:KUBERNETES_VERSION}
4646
- op: add
4747
path: /spec/config/processors/resource/attributes/-
4848
value:
4949
action: upsert
50-
key: github.actions.triggered_by
51-
value: ${env:TRIGGERED_BY}
50+
key: github.actions.triggered_by
51+
value: ${env:TRIGGERED_BY}
5252
5353
# Specifically override config for the kubernetes-events collector.
5454
- target:

send-slack-notification/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ runs:
106106
echo "HEALTH_RATE=$(echo "$TEST_HEALTH" | cut -d ',' -f 3)" | tee -a "$GITHUB_ENV"
107107
108108
if [ "$TEST_RESULT" == "failure" ]; then
109-
echo "MESSAGE_TEXT=The integration test for *GITHUB_REPOSITORY* failed" | tee -a "$GITHUB_ENV"
109+
echo "MESSAGE_TEXT=The integration test for *$GITHUB_REPOSITORY* failed" | tee -a "$GITHUB_ENV"
110110
echo -e "MESSAGE_TEMPLATE<<EOF\n$(cat ${GITHUB_ACTION_PATH}/templates/integration-test/failure.tpl)\nEOF" | tee -a "$GITHUB_ENV"
111111
else
112-
echo "MESSAGE_TEXT=The integration test for *GITHUB_REPOSITORY* succeeded" | tee -a "$GITHUB_ENV"
112+
echo "MESSAGE_TEXT=The integration test for *$GITHUB_REPOSITORY* succeeded" | tee -a "$GITHUB_ENV"
113113
echo -e "MESSAGE_TEMPLATE<<EOF\n$(cat ${GITHUB_ACTION_PATH}/templates/integration-test/success.tpl)\nEOF" | tee -a "$GITHUB_ENV"
114114
fi
115115
fi

0 commit comments

Comments
 (0)