Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] Replace the images for the E2E tests with the ones built in this repository #2222

Merged
merged 7 commits into from
Oct 13, 2023
Merged

[chore] Replace the images for the E2E tests with the ones built in this repository #2222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a1263f3
Replace the images by the ones hosted in the repository
iblancasa Oct 11, 2023
ca15d36
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
iblancasa Oct 11, 2023
6d57d58
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
iblancasa Oct 13, 2023
57f4f40
Revert change
iblancasa Oct 13, 2023
c0c0c24
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
iblancasa Oct 13, 2023
fb8686b
Merge branch 'main' into task/2073
iblancasa Oct 13, 2023
7bc8f9b
Merge branch 'main' into task/2073
jaronoff97 Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
resources:
- manager.yaml
- manager.yaml
4 changes: 1 addition & 3 deletions tests/e2e-instrumentation/instrumentation-apache-httpd/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ spec:
fsGroup: 2000
containers:
- name: myapp
image: docker.io/chrlic/apache-test@sha256:fad58c6ce7a4f477b455bece2a1980741fa6f81cef1e1093a3b72f9b2ffa7b8e
# image source at https://github.com/cisco-open/appdynamics-k8s-webhook-instrumentor/tree/main/testWorkloads/apache-httpd
# licensed under Apache 2.0
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-apache-httpd:main
imagePullPolicy: Always
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: myapp
image: docker.io/avadhutp123/aspnetapp@sha256:d2e8d3415f6f12efae0369aa0a9777a58583841fb133f33e10a73adb9fb392da # source code of the application: https://github.com/dotnet/dotnet-docker/tree/main/samples/aspnetapp
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-dotnet:main
- name: myrabbit
image: rabbitmq:3
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-dotnet-multicontainer/02-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: myapp
image: docker.io/avadhutp123/aspnetapp@sha256:d2e8d3415f6f12efae0369aa0a9777a58583841fb133f33e10a73adb9fb392da # source code of the application: https://github.com/dotnet/dotnet-docker/tree/main/samples/aspnetapp
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-dotnet:main
- name: myrabbit
image: rabbitmq:3
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-dotnet-musl/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
fsGroup: 2000
containers:
- name: myapp
image: docker.io/avadhutp123/aspnetapp@sha256:d2e8d3415f6f12efae0369aa0a9777a58583841fb133f33e10a73adb9fb392da # source code of the application: https://github.com/dotnet/dotnet-docker/tree/main/samples/aspnetapp
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-dotnet:main
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-dotnet/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
fsGroup: 2000
containers:
- name: myapp
image: docker.io/avadhutp123/aspnetapp@sha256:d2e8d3415f6f12efae0369aa0a9777a58583841fb133f33e10a73adb9fb392da # source code of the application: https://github.com/dotnet/dotnet-docker/tree/main/samples/aspnetapp
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-dotnet:main
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
7 changes: 1 addition & 6 deletions tests/e2e-instrumentation/instrumentation-go/02-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,4 @@ spec:
fsGroup: 2000
containers:
- name: productcatalogservice
image: ghcr.io/open-telemetry/demo:1.3.1-productcatalogservice
env:
- name: "PRODUCT_CATALOG_SERVICE_PORT"
value: "8080"
- name: "FEATURE_FLAG_GRPC_SERVICE_ADDR"
value: "localhost:50053"
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-golang:main
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-java-multicontainer/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: myapp
image: ghcr.io/pavolloffay/spring-petclinic:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-java:main
- name: myrabbit
image: rabbitmq:3
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-java-multicontainer/02-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: myapp
image: ghcr.io/pavolloffay/spring-petclinic:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-java:main
- name: myrabbit
image: rabbitmq:3
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-java-other-ns/03-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
fsGroup: 2000
containers:
- name: myapp
image: ghcr.io/pavolloffay/spring-petclinic:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-java:main
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-java/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
fsGroup: 2000
containers:
- name: myapp
image: ghcr.io/pavolloffay/spring-petclinic:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-java:main
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: myapp
image: ghcr.io/anuraaga/express-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-nodejs:main
- name: myrabbit
image: rabbitmq:3
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-nodejs-multicontainer/02-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: myapp
image: ghcr.io/anuraaga/express-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-nodejs:main
- name: myrabbit
image: rabbitmq:3
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-nodejs/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
fsGroup: 2000
containers:
- name: myapp
image: ghcr.io/anuraaga/express-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-nodejs:main
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-python-multicontainer/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: myapp
image: ghcr.io/anuraaga/flask-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
- name: myrabbit
image: rabbitmq:3
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-python-multicontainer/02-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ spec:
spec:
containers:
- name: myapp
image: ghcr.io/anuraaga/flask-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
- name: myrabbit
image: rabbitmq:3
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-python/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
fsGroup: 2000
containers:
- name: myapp
image: ghcr.io/anuraaga/flask-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-instrumentation/instrumentation-sdk/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ spec:
fsGroup: 2000
containers:
- name: myapp
image: ghcr.io/anuraaga/express-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
9 changes: 4 additions & 5 deletions tests/e2e-multi-instrumentation/instrumentation-multi-multicontainer/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ spec:
spec:
containers:
- name: dotnetapp
# source code of the application: https://github.com/dotnet/dotnet-docker/tree/main/samples/aspnetapp
image: docker.io/avadhutp123/aspnetapp@sha256:d2e8d3415f6f12efae0369aa0a9777a58583841fb133f33e10a73adb9fb392da
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-dotnet:main
- name: javaapp
image: ghcr.io/pavolloffay/spring-petclinic:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-java:main
- name: nodejsapp
image: ghcr.io/anuraaga/express-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-nodejs:main
- name: pythonapp
image: ghcr.io/anuraaga/flask-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
- name: shouldnt-be-instrumented
image: rabbitmq:3
env:
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e-multi-instrumentation/instrumentation-multi-no-containers/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ spec:
spec:
containers:
- name: nodejsapp
image: ghcr.io/anuraaga/express-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-nodejs:main
env:
- name: TEST
value: test
- name: pythonapp
image: ghcr.io/anuraaga/flask-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
env:
- name: TEST
value: test
4 changes: 2 additions & 2 deletions ...2e-multi-instrumentation/instrumentation-single-instr-first-container/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ spec:
spec:
containers:
- name: nodejsapp
image: ghcr.io/anuraaga/express-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-nodejs:main
- name: pythonapp
image: ghcr.io/anuraaga/flask-hello-world:latest
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
env:
- name: TEST
value: test
2 changes: 1 addition & 1 deletion tests/e2e/smoke-sidecar-other-namespace/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ spec:
spec:
containers:
- name: myapp
image: registry.k8s.io/echoserver:1.10
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
2 changes: 1 addition & 1 deletion tests/e2e/smoke-sidecar/01-install-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ spec:
spec:
containers:
- name: myapp
image: registry.k8s.io/echoserver:1.10
image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
Loading