Skip to content

Update k8s tests #372

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

Merged
merged 2 commits into from
Feb 15, 2025
Merged

Update k8s tests #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce7a709
Reapply "Rename service name (#369)" (#371)
pxaws Feb 15, 2025
740dfc4
update k8s tests
pxaws Feb 15, 2025
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
12 changes: 6 additions & 6 deletions .github/workflows/dotnet-k8s-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name dotnet-sample-app-deployment-${{ env.TESTING_ID }}
--remote-service-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name dotnet-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name dotnet-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand All @@ -204,8 +204,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name dotnet-sample-app-deployment-${{ env.TESTING_ID }}
--remote-service-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name dotnet-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name dotnet-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand All @@ -222,8 +222,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name dotnet-sample-app-deployment-${{ env.TESTING_ID }}
--remote-service-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name dotnet-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name dotnet-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name dotnet-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/java-k8s-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name java-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand All @@ -209,8 +209,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name java-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name java-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand All @@ -227,8 +227,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name java-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name java-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/node-k8s-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name node-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand All @@ -203,8 +203,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name node-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name node-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand All @@ -221,8 +221,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name sample-application-${{ env.TESTING_ID }}
--remote-service-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name node-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name node-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/python-k8s-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name python-sample-application-${{ env.TESTING_ID }}
--remote-service-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name python-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand All @@ -209,8 +209,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name python-sample-application-${{ env.TESTING_ID }}
--remote-service-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name python-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name python-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand All @@ -227,8 +227,8 @@ jobs:
--platform-info k8s-cluster-${{ env.TESTING_ID }}
--app-namespace ${{ env.SAMPLE_APP_NAMESPACE }}
--service-name python-sample-application-${{ env.TESTING_ID }}
--remote-service-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-deployment-name python-sample-r-app-deployment-${{ env.TESTING_ID }}
--remote-service-name python-remote-${{ env.TESTING_ID }}
--remote-service-deployment-name python-remote-${{ env.TESTING_ID }}
--query-string ip=${{ env.REMOTE_SERVICE_IP }}&testingId=${{ env.TESTING_ID }}
--rollup'

Expand Down
2 changes: 1 addition & 1 deletion terraform/dotnet/eks/linux/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ resource "kubernetes_service" "dotnet_app_service" {
resource "kubernetes_deployment" "dotnet_r_app_deployment" {

metadata {
name = "dotnet-r-app-deployment-${var.test_id}"
name = "dotnet-remote-${var.test_id}"
namespace = var.test_namespace
labels = {
app = "remote-app"
Expand Down
9 changes: 6 additions & 3 deletions terraform/java/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,14 @@ resource "kubernetes_deployment" "sample_remote_app_deployment" {
}
}

resource "kubernetes_service" "sample_remote_app_service" {
resource "kubernetes_service" "sample_remote_app_deployment" {
depends_on = [ kubernetes_deployment.sample_remote_app_deployment ]

metadata {
name = "sample-remote-app-service"
# use the same name as the deployment to handle the edge case when the deployment name is longer than 47 characters
# in this edge case, we just use the service name (rather than deployment name) as RemoteService
# see https://github.com/aws/amazon-cloudwatch-agent/pull/1553
name = "sample-r-app-deployment-${var.test_id}"
namespace = var.test_namespace
}
spec {
Expand Down Expand Up @@ -260,4 +263,4 @@ resource "kubernetes_deployment" "traffic_generator" {
}
}
}
}
}
4 changes: 2 additions & 2 deletions terraform/java/k8s/deploy/resources/remote-service-depl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: java-remote-${TESTING_ID}
namespace: java-sample-app-namespace
namespace: sample-app-namespace
spec:
replicas: 1
selector:
Expand Down Expand Up @@ -33,7 +33,7 @@ apiVersion: v1
kind: Service
metadata:
name: java-remote-service
namespace: java-sample-app-namespace
namespace: sample-app-namespace
spec:
selector:
app: remote-app
Expand Down
2 changes: 1 addition & 1 deletion terraform/node/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ resource "kubernetes_service" "sample_app_service" {
resource "kubernetes_deployment" "sample_remote_app_deployment" {

metadata {
name = "sample-r-app-deployment-${var.test_id}"
name = "sample-remote-${var.test_id}"
namespace = var.test_namespace
labels = {
app = "remote-app"
Expand Down
4 changes: 2 additions & 2 deletions terraform/node/k8s/deploy/resources/remote-service-depl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: node-remote-${TESTING_ID}
namespace: node-sample-app-namespace
namespace: sample-app-namespace
spec:
replicas: 1
selector:
Expand Down Expand Up @@ -34,7 +34,7 @@ apiVersion: v1
kind: Service
metadata:
name: node-remote-service
namespace: node-sample-app-namespace
namespace: sample-app-namespace
spec:
selector:
app: remote-app
Expand Down
2 changes: 1 addition & 1 deletion terraform/python/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ resource "kubernetes_service" "python_app_service" {
resource "kubernetes_deployment" "python_r_app_deployment" {

metadata {
name = "python-r-app-deployment-${var.test_id}"
name = "python-remote-${var.test_id}"
namespace = var.test_namespace
labels = {
app = "remote-app"
Expand Down