diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index b5378ab2cf1e..255a0bbc5194 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -35,23 +35,15 @@ jobs: run: make -j2 gomoddownload - name: Build Docker Image run: | - make docker-otelcontribcol docker-telemetrygen - - name: export otelcontribcol image to tar + make docker-otelcontribcol + - name: export image to tar run: | docker save otelcontribcol:latest > /tmp/otelcontribcol.tar - - name: export telemetrygen image to tar - run: | - docker save telemetrygen:latest > /tmp/telemetrygen.tar - - name: Upload otelcontribcol artifact + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: otelcontribcol path: /tmp/otelcontribcol.tar - - name: Upload telemetrygen artifact - uses: actions/upload-artifact@v3 - with: - name: telemetrygen - path: /tmp/telemetrygen.tar kubernetes-test: env: KUBECONFIG: /tmp/kube-config-otelcol-e2e-testing @@ -89,23 +81,12 @@ jobs: with: name: otelcontribcol path: /tmp - - name: Load otelcontribcol Docker image + - name: Load Docker image run: | docker load --input /tmp/otelcontribcol.tar - name: Kind load image run: | kind load docker-image otelcontribcol:latest --name kind - - name: Download artifact - uses: actions/download-artifact@v3 - with: - name: telemetrygen - path: /tmp - - name: Load telemetrygen Docker image - run: | - docker load --input /tmp/telemetrygen.tar - - name: Kind load image - run: | - kind load docker-image telemetrygen:latest --name kind - name: run k8sclusterreceiver e2e tests run: | cd receiver/k8sclusterreceiver diff --git a/processor/k8sattributesprocessor/e2e_test.go b/processor/k8sattributesprocessor/e2e_test.go index 2f92bbfd245d..11c7479f6e37 100644 --- a/processor/k8sattributesprocessor/e2e_test.go +++ b/processor/k8sattributesprocessor/e2e_test.go @@ -54,9 +54,8 @@ func newExpectedValue(mode int, value string) *expectedValue { // `/tmp/kube-config-otelcol-e2e-testing`. Run the following command prior to running the test locally: // // kind create cluster --kubeconfig=/tmp/kube-config-otelcol-e2e-testing -// make docker-otelcontribcol docker-telemetrygen +// make docker-otelcontribcol // KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image otelcontribcol:latest -// KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image telemetrygen:latest func TestE2E(t *testing.T) { kubeConfig, err := clientcmd.BuildConfigFromFlags("", testKubeConfig) require.NoError(t, err) @@ -105,7 +104,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-job"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -127,7 +126,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-statefulset"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -151,7 +150,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-deployment"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -173,7 +172,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-traces-daemonset"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -195,7 +194,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-job"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -217,7 +216,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-statefulset"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -241,7 +240,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-deployment"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -263,7 +262,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-metrics-daemonset"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -285,7 +284,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-job"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -307,7 +306,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-statefulset"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -331,7 +330,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-deployment"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, @@ -353,7 +352,7 @@ func TestE2E(t *testing.T) { "k8s.labels.app": newExpectedValue(equal, "telemetrygen-"+testID+"-logs-daemonset"), "k8s.container.name": newExpectedValue(equal, "telemetrygen"), "k8s.cluster.uid": newExpectedValue(exist, ""), - "container.image.name": newExpectedValue(equal, "telemetrygen"), + "container.image.name": newExpectedValue(equal, "ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen"), "container.image.tag": newExpectedValue(equal, "latest"), "container.id": newExpectedValue(exist, ""), }, diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml index 2e3ca11b31e2..d89d22c53878 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/daemonset.yaml @@ -24,7 +24,6 @@ spec: - --rate=1 - --otlp-attributes=service.name="test-{{ .DataType }}-daemonset" - --otlp-attributes=k8s.container.name="telemetrygen" - image: telemetrygen:latest - imagePullPolicy: Never + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest name: telemetrygen restartPolicy: Always diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml index 05ccc2c1601c..43cc0665d383 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/deployment.yaml @@ -25,7 +25,7 @@ spec: - --rate=1 - --otlp-attributes=service.name="test-{{ .DataType }}-deployment" - --otlp-attributes=k8s.container.name="telemetrygen" - image: telemetrygen:latest - imagePullPolicy: Never + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest + imagePullPolicy: IfNotPresent name: telemetrygen restartPolicy: Always diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml index 930fa8e9e3be..efedb1b7e8e1 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/job.yaml @@ -21,7 +21,6 @@ spec: - --duration=36000s - --otlp-attributes=service.name="test-{{ .DataType }}-job" - --otlp-attributes=k8s.container.name="telemetrygen" - image: telemetrygen:latest - imagePullPolicy: Never + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest name: telemetrygen - restartPolicy: OnFailure + restartPolicy: Never diff --git a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml index 395ca8918d87..b23c4e4ee508 100644 --- a/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml +++ b/processor/k8sattributesprocessor/testdata/e2e/telemetrygen/statefulset.yaml @@ -26,7 +26,6 @@ spec: - --rate=1 - --otlp-attributes=service.name="test-{{ .DataType }}-statefulset" - --otlp-attributes=k8s.container.name="telemetrygen" - image: "telemetrygen:latest" - imagePullPolicy: Never + image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:latest name: telemetrygen restartPolicy: Always diff --git a/receiver/k8sclusterreceiver/e2e_test.go b/receiver/k8sclusterreceiver/e2e_test.go index 299fc895f0e1..81d22a779cf2 100644 --- a/receiver/k8sclusterreceiver/e2e_test.go +++ b/receiver/k8sclusterreceiver/e2e_test.go @@ -36,9 +36,8 @@ const testKubeConfig = "/tmp/kube-config-otelcol-e2e-testing" // `/tmp/kube-config-otelcol-e2e-testing`. Run the following command prior to running the test locally: // // kind create cluster --kubeconfig=/tmp/kube-config-otelcol-e2e-testing -// make docker-otelcontribcol docker-telemetrygen +// make docker-otelcontribcol // KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image otelcontribcol:latest -// KUBECONFIG=/tmp/kube-config-otelcol-e2e-testing kind load docker-image telemetrygen:latest func TestE2E(t *testing.T) { var expected pmetric.Metrics expectedFile := filepath.Join("testdata", "e2e", "expected.yaml")