Skip to content

Commit 6462034

Browse files
jinja2jinja2
authored
Merge branch 'main' into openshift-resource-detector
2 parents e638844 + cd40b3a commit 6462034

14 files changed

+796
-354
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
20-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
20+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
2121
with:
2222
go-version: ${{ env.GO_VERSION }}
2323
cache: false
@@ -42,7 +42,7 @@ jobs:
4242
needs: [setup-environment]
4343
steps:
4444
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
45-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
45+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
4646
with:
4747
go-version: ${{ env.GO_VERSION }}
4848
cache: false

‎.github/workflows/functional_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
steps:
6363
- name: Checkout
6464
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
65-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
65+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
6666
with:
6767
go-version: ${{ env.GO_VERSION }}
6868
cache-dependency-path: '**/go.sum'

‎.github/workflows/functional_test_v2.yaml‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
6262
steps:
6363
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
64-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
64+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
6565
with:
6666
go-version: ${{ env.GO_VERSION }}
6767
cache-dependency-path: '**/go.sum'
@@ -78,6 +78,9 @@ jobs:
7878
- name: Update dependencies
7979
run: |
8080
make dep-update
81+
- name: Build and load test images into kind
82+
run: |
83+
make kind-build-test-images
8184
- name: run functional tests
8285
id: run-functional-tests
8386
env:
@@ -118,12 +121,12 @@ jobs:
118121
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
119122
steps:
120123
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
121-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
124+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
122125
with:
123126
go-version: ${{ env.GO_VERSION }}
124127
cache-dependency-path: '**/go.sum'
125128
- name: Configure AWS credentials
126-
uses: aws-actions/configure-aws-credentials@cabfdba3510de1431bac9dba27511d97497fc100 # v5
129+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5
127130
with:
128131
aws-access-key-id: ${{ secrets.AWS_KEY }}
129132
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
@@ -157,12 +160,12 @@ jobs:
157160
helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
158161
helm repo update
159162
helm pull splunk-otel-collector-chart/splunk-otel-collector --untar --untardir base
160-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
163+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
161164
with:
162165
go-version: ${{ env.GO_VERSION }}
163166
cache-dependency-path: '**/go.sum'
164167
- name: Configure AWS credentials
165-
uses: aws-actions/configure-aws-credentials@cabfdba3510de1431bac9dba27511d97497fc100 # v5
168+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5
166169
with:
167170
aws-access-key-id: ${{ secrets.AWS_KEY }}
168171
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
@@ -192,7 +195,7 @@ jobs:
192195
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
193196
steps:
194197
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
195-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
198+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
196199
with:
197200
go-version: ${{ env.GO_VERSION }}
198201
cache-dependency-path: '**/go.sum'
@@ -234,7 +237,7 @@ jobs:
234237
helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
235238
helm repo update
236239
helm pull splunk-otel-collector-chart/splunk-otel-collector --untar --untardir base
237-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
240+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
238241
with:
239242
go-version: ${{ env.GO_VERSION }}
240243
cache-dependency-path: '**/go.sum'
@@ -272,7 +275,7 @@ jobs:
272275
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
273276
steps:
274277
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
275-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
278+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
276279
with:
277280
go-version: ${{ env.GO_VERSION }}
278281
cache-dependency-path: '**/go.sum'
@@ -283,7 +286,7 @@ jobs:
283286
- uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
284287
with:
285288
creds: ${{ secrets.AZURE_CREDENTIALS }}
286-
- uses: azure/aks-set-context@0f6a7a712dd90901e06e8ecb972e773574dee819 # v4
289+
- uses: azure/aks-set-context@c7eb093e5a5d47caa333f64974d5fd1cd4bf069d # v4
287290
with:
288291
resource-group: ${{ secrets.AKS_RESOURCE_GROUP }}
289292
cluster-name: ${{ secrets.AKS_CLUSTER_NAME }}
@@ -314,7 +317,7 @@ jobs:
314317
helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
315318
helm repo update
316319
helm pull splunk-otel-collector-chart/splunk-otel-collector --untar --untardir base
317-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
320+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
318321
with:
319322
go-version: ${{ env.GO_VERSION }}
320323
cache-dependency-path: '**/go.sum'
@@ -325,7 +328,7 @@ jobs:
325328
- uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
326329
with:
327330
creds: ${{ secrets.AZURE_CREDENTIALS }}
328-
- uses: azure/aks-set-context@0f6a7a712dd90901e06e8ecb972e773574dee819 # v4
331+
- uses: azure/aks-set-context@c7eb093e5a5d47caa333f64974d5fd1cd4bf069d # v4
329332
with:
330333
resource-group: ${{ secrets.AKS_RESOURCE_GROUP }}
331334
cluster-name: ${{ secrets.AKS_CLUSTER_NAME }}
@@ -348,12 +351,11 @@ jobs:
348351
(github.ref == 'refs/heads/main')
349352
env:
350353
KUBE_TEST_ENV: gce
351-
SKIP_TESTS: "true"
352354
runs-on: ubuntu-latest
353355
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
354356
steps:
355357
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
356-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
358+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
357359
with:
358360
go-version: ${{ env.GO_VERSION }}
359361
cache-dependency-path: '**/go.sum'
@@ -384,12 +386,12 @@ jobs:
384386
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
385387
steps:
386388
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
387-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
389+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
388390
with:
389391
go-version: ${{ env.GO_VERSION }}
390392
cache-dependency-path: '**/go.sum'
391393
- name: Configure AWS credentials
392-
uses: aws-actions/configure-aws-credentials@cabfdba3510de1431bac9dba27511d97497fc100 # v5
394+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5
393395
with:
394396
aws-access-key-id: ${{ secrets.AWS_KEY }}
395397
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
@@ -424,12 +426,12 @@ jobs:
424426
helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
425427
helm repo update
426428
helm pull splunk-otel-collector-chart/splunk-otel-collector --untar --untardir base
427-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
429+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
428430
with:
429431
go-version: ${{ env.GO_VERSION }}
430432
cache-dependency-path: '**/go.sum'
431433
- name: Configure AWS credentials
432-
uses: aws-actions/configure-aws-credentials@cabfdba3510de1431bac9dba27511d97497fc100 # v5
434+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5
433435
with:
434436
aws-access-key-id: ${{ secrets.AWS_KEY }}
435437
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
@@ -460,12 +462,12 @@ jobs:
460462
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
461463
steps:
462464
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
463-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
465+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
464466
with:
465467
go-version: ${{ env.GO_VERSION }}
466468
cache-dependency-path: '**/go.sum'
467469
- name: Configure AWS credentials
468-
uses: aws-actions/configure-aws-credentials@cabfdba3510de1431bac9dba27511d97497fc100 # v5
470+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5
469471
with:
470472
aws-access-key-id: ${{ secrets.AWS_KEY }}
471473
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
@@ -499,12 +501,12 @@ jobs:
499501
helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
500502
helm repo update
501503
helm pull splunk-otel-collector-chart/splunk-otel-collector --untar --untardir base
502-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
504+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
503505
with:
504506
go-version: ${{ env.GO_VERSION }}
505507
cache-dependency-path: '**/go.sum'
506508
- name: Configure AWS credentials
507-
uses: aws-actions/configure-aws-credentials@cabfdba3510de1431bac9dba27511d97497fc100 # v5
509+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5
508510
with:
509511
aws-access-key-id: ${{ secrets.AWS_KEY }}
510512
aws-secret-access-key: ${{ secrets.AWS_SECRET }}
@@ -535,7 +537,7 @@ jobs:
535537
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
536538
steps:
537539
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
538-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
540+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
539541
with:
540542
go-version: ${{ env.GO_VERSION }}
541543
cache-dependency-path: '**/go.sum'
@@ -571,7 +573,7 @@ jobs:
571573
helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
572574
helm repo update
573575
helm pull splunk-otel-collector-chart/splunk-otel-collector --untar --untardir base
574-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
576+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
575577
with:
576578
go-version: ${{ env.GO_VERSION }}
577579
cache-dependency-path: '**/go.sum'
@@ -603,7 +605,7 @@ jobs:
603605
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
604606
steps:
605607
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
606-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
608+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
607609
with:
608610
go-version: ${{ env.GO_VERSION }}
609611
cache-dependency-path: '**/go.sum'
@@ -645,7 +647,7 @@ jobs:
645647
helm repo add splunk-otel-collector-chart https://signalfx.github.io/splunk-otel-collector-chart
646648
helm repo update
647649
helm pull splunk-otel-collector-chart/splunk-otel-collector --untar --untardir base
648-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
650+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
649651
with:
650652
go-version: ${{ env.GO_VERSION }}
651653
cache-dependency-path: '**/go.sum'

‎.github/workflows/instrumentation_cr_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'Ignore Tests') }}
1616
steps:
1717
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
18-
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
18+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
1919
with:
2020
go-version-file: functional_tests/go.mod
2121
cache-dependency-path: functional_tests/go.sum

‎.github/workflows/validate-changelog.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fetch-depth: 0
2525

2626
- name: Set up Go
27-
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6
27+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6
2828
with:
2929
go-version: ${{ env.GO_VERSION }}
3030

‎Makefile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,29 @@ kind-delete: ## Delete kind cluster and remove kubeconfig
327327
fi
328328
@echo "=== Kind cluster cleanup complete ==="
329329

330+
PYTHON_TEST_IMAGE ?= quay.io/splunko11ytest/python_test:latest
331+
NODEJS_TEST_IMAGE ?= quay.io/splunko11ytest/nodejs_test:latest
332+
333+
.PHONY: kind-build-test-images
334+
kind-build-test-images: ## Build test app images and load them into kind cluster
335+
@echo "Building Python test app image..."
336+
docker build -t $(PYTHON_TEST_IMAGE) functional_tests/functional/testdata/python
337+
@echo "Building Node.js test app image..."
338+
docker build -t $(NODEJS_TEST_IMAGE) functional_tests/functional/testdata/nodejs
339+
@echo "Loading test app images into kind cluster..."
340+
kind load docker-image $(PYTHON_TEST_IMAGE) --name=$(KIND_CLUSTER_NAME)
341+
kind load docker-image $(NODEJS_TEST_IMAGE) --name=$(KIND_CLUSTER_NAME)
342+
@echo "=== Test images loaded into kind ==="
343+
330344
.PHONY: functionaltest-local
331345
functionaltest-local: ## Run functional tests using local kind cluster (automatically sets up and tears down cluster)
332346
@echo "Running functional tests with automated kind cluster management..."
333347
@echo "=== Setting up kind cluster ==="
334348
$(MAKE) kind-setup
335349
@echo ""
350+
@echo "=== Building and loading test images ==="
351+
$(MAKE) kind-build-test-images
352+
@echo ""
336353
@echo "=== Running functional tests ==="
337354
@echo "Using kind cluster: $(KIND_CLUSTER_NAME)"
338355
@echo "Using kubeconfig: $(KUBECONFIG_TEST)"

0 commit comments

Comments
 (0)