-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into ansible-replace-sfx-with-splunk-otel-dotnet
- Loading branch information
Showing
22 changed files
with
821 additions
and
35 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -392,3 +392,61 @@ jobs: | |
| run: make integration-test-${{ matrix.SERVICE }}-discovery | ||
| env: | ||
| SPLUNK_OTEL_COLLECTOR_IMAGE: 'otelcol:latest' | ||
|
|
||
| integration-test-discovery-k8s-matrix: | ||
| runs-on: ubuntu-24.04 | ||
| outputs: | ||
| matrix: ${{ steps.get-matrix-k8s.outputs.matrix }} | ||
| steps: | ||
| - name: Get matrix for Kubernetes | ||
| id: get-matrix-k8s | ||
| run: | | ||
| includes="" | ||
| for service in "envoy"; do | ||
| for arch in "amd64"; do | ||
| includes="${includes},{\"SERVICE\": \"${service}\", \"ARCH\": \"${arch}\"}" | ||
| done | ||
| done | ||
| matrix="{\"include\": [${includes#,}]}" | ||
| echo "$matrix" | jq | ||
| echo "matrix=${matrix}" >> $GITHUB_OUTPUT | ||
| integration-test-discovery-k8s: | ||
| name: integration-test-discovery-k8s | ||
| runs-on: ubuntu-24.04 | ||
| needs: [ "docker-otelcol", "otelcol", "integration-test-discovery-k8s-matrix" ] | ||
| strategy: | ||
| matrix: ${{ fromJSON(needs.integration-test-discovery-k8s-matrix.outputs.matrix) }} | ||
| fail-fast: false | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Create kind cluster | ||
| uses: helm/[email protected] | ||
| with: | ||
| node_image: kindest/node:v1.30.0 | ||
| kubectl_version: v1.30.0 | ||
| cluster_name: kind | ||
| - name: Deploy service under test | ||
| run: | | ||
| kubectl apply -f k8s/${{ matrix.SERVICE }}/*.yaml | ||
| - uses: actions/setup-go@v5 | ||
| with: | ||
| go-version: ${{ env.GO_VERSION }} | ||
| cache-dependency-path: '**/go.sum' | ||
| - uses: actions/download-artifact@v4 | ||
| with: | ||
| name: docker-otelcol-${{ matrix.ARCH }} | ||
| path: ./docker-otelcol/${{ matrix.ARCH }} | ||
| - run: docker load -i ./docker-otelcol/${{ matrix.ARCH }}/image.tar | ||
| - name: Load Docker image in kind | ||
| run: | | ||
| kind load docker-image otelcol:latest --name kind | ||
| - name: Run ${{ matrix.SERVICE }} Discovery Kubernetes Integration Test | ||
| run: KUBECONFIG=$HOME/.kube/config SKIP_TEARDOWN=true make integration-test-${{ matrix.SERVICE }}-discovery-k8s | ||
| - name: Print logs | ||
| if: failure() | ||
| run: | | ||
| kubectl get pods | ||
| kubectl logs $(kubectl get pod -l app=otelcol -o jsonpath="{.items[0].metadata.name}") | ||
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| v2.10.0 | ||
| v2.11.0 |
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 |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: envoy-test | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| app: envoy-test | ||
| template: | ||
| metadata: | ||
| name: envoy-test | ||
| labels: | ||
| app: envoy-test | ||
| spec: | ||
| automountServiceAccountToken: false | ||
| containers: | ||
| - image: envoyproxy/envoy:v1.32-latest | ||
| name: envoy-test | ||
| imagePullPolicy: IfNotPresent | ||
| ports: | ||
| - containerPort: 10000 | ||
| name: envoy | ||
| - containerPort: 9901 | ||
| name: admin | ||
|
|
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 |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| global using Xunit; | ||
| global using FluentAssertions; |
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
Oops, something went wrong.