Skip to content

Commit 32daf72

Browse files
harrryrharrryr
committed
Update after comments
1 parent d658431 commit 32daf72

21 files changed

+105
-132
lines changed

‎.github/workflows/java-ec2-asg-e2e-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ jobs:
122122
-var="sample_remote_app_jar=${{ env.SAMPLE_APP_REMOTE_SERVICE_JAR }}" \
123123
-var="get_cw_agent_rpm_command=${{ env.GET_CW_AGENT_RPM_COMMAND }}" \
124124
-var="get_adot_jar_command=${{ env.GET_ADOT_JAR_COMMAND }}" \
125-
-var="canary_type=${{ github.job }}" \
126125
|| deployment_failed=$?
127126
128127
if [ $deployment_failed -eq 1 ]; then

‎.github/workflows/java-ec2-default-e2e-test.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- name: Initiate Terraform
9999
uses: ./.github/workflows/actions/execute_and_retry
100100
with:
101-
command: "pwd && cd ${{ env.TEST_RESOURCES_FOLDER }}/terraform/java/ec2/default && terraform init && terraform validate"
101+
command: "cd ${{ env.TEST_RESOURCES_FOLDER }}/terraform/java/ec2/default && terraform init && terraform validate"
102102
cleanup: "rm -rf .terraform && rm -rf .terraform.lock.hcl"
103103
max_retry: 6
104104
sleep_time: 60
@@ -122,12 +122,7 @@ jobs:
122122
-var="sample_remote_app_jar=${{ env.SAMPLE_APP_REMOTE_SERVICE_JAR }}" \
123123
-var="get_cw_agent_rpm_command=${{ env.GET_CW_AGENT_RPM_COMMAND }}" \
124124
-var="get_adot_jar_command=${{ env.GET_ADOT_JAR_COMMAND }}" \
125-
-var="canary_type=${{ github.job }}" \
126125
|| deployment_failed=$?
127-
128-
echo $(terraform state show aws_key_pair.aws_ssh_key)
129-
echo $(terraform output -json private_key_content)
130-
131126
132127
if [ $deployment_failed -eq 1 ]; then
133128
echo "Terraform deployment was unsuccessful. Will attempt to retry deployment."

‎.github/workflows/java-eks-e2e-test.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,9 @@ jobs:
208208
-var="rds_mysql_cluster_endpoint=${{env.RDS_MYSQL_CLUSTER_ENDPOINT}}" \
209209
-var="rds_mysql_cluster_username=${{env.RDS_MYSQL_CLUSTER_SECRETS_USERNAME}}" \
210210
-var='rds_mysql_cluster_password=${{env.RDS_MYSQL_CLUSTER_SECRETS_PASSWORD}}' \
211-
|| deployment_failed=$?
212-
211+
-var='account_id=${{ env.ACCOUNT_ID }}' \
212+
|| deployment_failed=$?
213+
213214
if [ $deployment_failed -ne 0 ]; then
214215
echo "Terraform deployment was unsuccessful. Will attempt to retry deployment."
215216
fi
@@ -302,26 +303,11 @@ jobs:
302303
- name: Get the sample app endpoint
303304
run: echo "APP_ENDPOINT=$(kubectl get pods -n ${{ env.SAMPLE_APP_NAMESPACE }} --selector=app=sample-app -o jsonpath='{.items[0].status.podIP}'):8080" >> $GITHUB_ENV
304305

305-
- name: Deploy the traffic generator
306+
- name: Set endpoints for the traffic generator
306307
run: |
307-
# Deploy the traffic generator
308-
kubectl create deployment -n ${{ env.SAMPLE_APP_NAMESPACE }} traffic-generator \
309-
--image=${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/e2e-test-resource:traffic-generator \
310-
--replicas=1
311-
312-
# Patch it with ImagePull always policy so that it pulls the latest image from the ECR
313-
kubectl patch deployment -n ${{ env.SAMPLE_APP_NAMESPACE }} traffic-generator --patch '{"spec": {"template": {"spec": {"containers": [{"name": "e2e-test-resource", "imagePullPolicy": "Always"}]}}}}'
314-
315308
# Add the appropriate environment variables to the traffic generator
316309
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator MAIN_ENDPOINT=${{ env.APP_ENDPOINT }}
317310
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator REMOTE_ENDPOINT=${{ env.REMOTE_SERVICE_POD_IP }}
318-
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator ID=${{ env.TESTING_ID }}
319-
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator CANARY_TYPE=${{ github.job }}
320-
321-
# Restart the traffic generator with the new configuration
322-
kubectl get pods -n ${{ env.SAMPLE_APP_NAMESPACE }} --no-headers | grep '^traffic-generator' | awk '{print $1}' | xargs kubectl delete pod -n ${{ env.SAMPLE_APP_NAMESPACE }} || true
323-
324-
sleep 10
325311
326312
- name: Initiate Gradlew Daemon
327313
if: steps.initiate-gradlew == 'failure'

‎.github/workflows/java-k8s-e2e-test.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ on:
2121
required: false
2222
type: string
2323

24-
concurrency:
25-
group: '${{ github.workflow }} @ ${{ inputs.aws-region }}'
26-
cancel-in-progress: false
24+
#concurrency:
25+
# group: '${{ github.workflow }} @ ${{ inputs.aws-region }}'
26+
# cancel-in-progress: false
2727

2828
permissions:
2929
id-token: write
@@ -40,6 +40,8 @@ env:
4040
METRIC_NAMESPACE: ApplicationSignals
4141
LOG_GROUP_NAME: /aws/application-signals/data
4242
TEST_RESOURCES_FOLDER: ${GITHUB_WORKSPACE}
43+
MAIN_SERVICE_ENDPOINT: ${{ secrets.TEMP_IAD_ENDPOINT_K8S }}
44+
MASTER_NODE_SSH_KEY: ${{ secrets.TEMP_IAD_SSH_KEY_K8S }}
4345

4446
jobs:
4547
java-k8s:
@@ -82,8 +84,8 @@ jobs:
8284
JAVA_MAIN_SAMPLE_APP_IMAGE, e2e-test/java-main-sample-app-image
8385
JAVA_REMOTE_SAMPLE_APP_IMAGE, e2e-test/java-remote-sample-app-image
8486
RELEASE_TESTING_ECR_ACCOUNT, e2e-test/${{ github.event.repository.name }}/java-k8s-release-testing-account
85-
MAIN_SERVICE_ENDPOINT, e2e-test/${{ github.event.repository.name }}/java-k8s-master-node-endpoint
86-
MASTER_NODE_SSH_KEY, e2e-test/${{ github.event.repository.name }}/java-k8s-ssh-key
87+
# MAIN_SERVICE_ENDPOINT, e2e-test/${{ github.event.repository.name }}/java-k8s-master-node-endpoint
88+
# MASTER_NODE_SSH_KEY, e2e-test/${{ github.event.repository.name }}/java-k8s-ssh-key
8789

8890
- name: Prepare and upload sample app deployment files
8991
working-directory: terraform/java/k8s/deploy/resources

‎.github/workflows/java-metric-limiter-e2e-test.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ jobs:
175175
-var="service_account_aws_access=sa-${{ env.TESTING_ID }}" \
176176
-var="sample_app_image=${{ env.MAIN_SAMPLE_APP_IMAGE_ARN }}" \
177177
-var="sample_remote_app_image=${{ env.REMOTE_SAMPLE_APP_IMAGE_ARN }}" \
178+
-var='account_id=${{ env.ACCOUNT_ID }}' \
178179
|| deployment_failed=$?
179180
180181
if [ $deployment_failed -ne 0 ]; then
@@ -285,26 +286,11 @@ jobs:
285286
- name: Get the sample app endpoint
286287
run: echo "APP_ENDPOINT=$(kubectl get pods -n ${{ env.SAMPLE_APP_NAMESPACE }} --selector=app=sample-app -o jsonpath='{.items[0].status.podIP}'):8080" >> $GITHUB_ENV
287288

288-
- name: Deploy the traffic generator
289+
- name: Set endpoints for the traffic generator
289290
run: |
290-
# Deploy the traffic generator
291-
kubectl create deployment -n ${{ env.SAMPLE_APP_NAMESPACE }} traffic-generator \
292-
--image=${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/e2e-test-resource:traffic-generator \
293-
--replicas=1
294-
295-
# Patch it with ImagePull always policy so that it pulls the latest image from the ECR
296-
kubectl patch deployment -n ${{ env.SAMPLE_APP_NAMESPACE }} traffic-generator --patch '{"spec": {"template": {"spec": {"containers": [{"name": "e2e-test-resource", "imagePullPolicy": "Always"}]}}}}'
297-
298291
# Add the appropriate environment variables to the traffic generator
299292
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator MAIN_ENDPOINT=${{ env.APP_ENDPOINT }}
300293
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator REMOTE_ENDPOINT=${{ env.REMOTE_SERVICE_POD_IP }}
301-
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator ID=${{ env.TESTING_ID }}
302-
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator CANARY_TYPE=${{ github.job }}
303-
304-
# Restart the traffic generator with the new configuration
305-
kubectl get pods -n ${{ env.SAMPLE_APP_NAMESPACE }} --no-headers | grep '^traffic-generator' | awk '{print $1}' | xargs kubectl delete pod -n ${{ env.SAMPLE_APP_NAMESPACE }} || true
306-
307-
sleep 10
308294
309295
- name: Initiate Gradlew Daemon
310296
if: steps.initiate-gradlew == 'failure'

‎.github/workflows/python-ec2-asg-e2e-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ jobs:
125125
-var="sample_app_zip=${{ env.SAMPLE_APP_ZIP }}" \
126126
-var="get_cw_agent_rpm_command=${{ env.GET_CW_AGENT_RPM_COMMAND }}" \
127127
-var="get_adot_wheel_command=${{ env.GET_ADOT_WHEEL_COMMAND }}" \
128-
-var="canary_type=${{ github.job }}" \
129128
|| deployment_failed=$?
130129
131130
if [ $deployment_failed -eq 1 ]; then

‎.github/workflows/python-ec2-default-e2e-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ jobs:
124124
-var="sample_app_zip=${{ env.SAMPLE_APP_ZIP }}" \
125125
-var="get_cw_agent_rpm_command=${{ env.GET_CW_AGENT_RPM_COMMAND }}" \
126126
-var="get_adot_wheel_command=${{ env.GET_ADOT_WHEEL_COMMAND }}" \
127-
-var="canary_type=${{ github.job }}" \
128127
|| deployment_failed=$?
129128
130129
if [ $deployment_failed -eq 1 ]; then

‎.github/workflows/python-eks-e2e-test.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ jobs:
210210
-var='rds_mysql_cluster_username=${{env.RDS_MYSQL_CLUSTER_SECRETS_USERNAME}}' \
211211
-var='rds_mysql_cluster_password=${{env.RDS_MYSQL_CLUSTER_SECRETS_PASSWORD}}' \
212212
-var='rds_mysql_cluster_database=information_schema' \
213+
-var='account_id=${{ env.ACCOUNT_ID }}' \
213214
|| deployment_failed=$?
214215
215216
if [ $deployment_failed -eq 1 ]; then
@@ -305,27 +306,12 @@ jobs:
305306
306307
- name: Get the sample app endpoint
307308
run: echo "APP_ENDPOINT=$(kubectl get pods -n ${{ env.SAMPLE_APP_NAMESPACE }} --selector=app=python-app -o jsonpath='{.items[0].status.podIP}'):8000" >> $GITHUB_ENV
309+
- name: Set endpoints for the traffic generator
308310

309-
- name: Deploy the traffic generator
310311
run: |
311-
# Deploy the traffic generator
312-
kubectl create deployment -n ${{ env.SAMPLE_APP_NAMESPACE }} traffic-generator \
313-
--image=${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.E2E_TEST_AWS_REGION }}.amazonaws.com/e2e-test-resource:traffic-generator \
314-
--replicas=1
315-
316-
# Patch it with ImagePull always policy so that it pulls the latest image from the ECR
317-
kubectl patch deployment -n ${{ env.SAMPLE_APP_NAMESPACE }} traffic-generator --patch '{"spec": {"template": {"spec": {"containers": [{"name": "e2e-test-resource", "imagePullPolicy": "Always"}]}}}}'
318-
319312
# Add the appropriate environment variables to the traffic generator
320313
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator MAIN_ENDPOINT=${{ env.APP_ENDPOINT }}
321314
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator REMOTE_ENDPOINT=${{ env.REMOTE_SERVICE_POD_IP }}
322-
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator ID=${{ env.TESTING_ID }}
323-
kubectl set env -n ${{ env.SAMPLE_APP_NAMESPACE }} deployment/traffic-generator CANARY_TYPE=${{ github.job }}
324-
325-
# Restart the traffic generator with the new configuration
326-
kubectl get pods -n ${{ env.SAMPLE_APP_NAMESPACE }} --no-headers | grep '^traffic-generator' | awk '{print $1}' | xargs kubectl delete pod -n ${{ env.SAMPLE_APP_NAMESPACE }} || true
327-
328-
sleep 10
329315
330316
- name: Initiate Gradlew Daemon
331317
if: steps.initiate-gradlew == 'failure'

‎.github/workflows/python-k8s-e2e-test.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ on:
2121
required: false
2222
type: string
2323

24-
concurrency:
25-
group: '${{ github.workflow }} @ ${{ inputs.aws-region }}'
26-
cancel-in-progress: false
24+
#concurrency:
25+
# group: '${{ github.workflow }} @ ${{ inputs.aws-region }}'
26+
# cancel-in-progress: false
2727

2828
permissions:
2929
id-token: write
@@ -40,6 +40,8 @@ env:
4040
METRIC_NAMESPACE: ApplicationSignals
4141
LOG_GROUP_NAME: /aws/application-signals/data
4242
TEST_RESOURCES_FOLDER: ${GITHUB_WORKSPACE}
43+
MAIN_SERVICE_ENDPOINT: ${{ secrets.TEMP_IAD_ENDPOINT_K8S }}
44+
MASTER_NODE_SSH_KEY: ${{ secrets.TEMP_IAD_SSH_KEY_K8S }}
4345

4446
jobs:
4547
python-k8s:
@@ -82,8 +84,8 @@ jobs:
8284
PYTHON_MAIN_SAMPLE_APP_IMAGE, e2e-test/python-main-sample-app-image
8385
PYTHON_REMOTE_SAMPLE_APP_IMAGE, e2e-test/python-remote-sample-app-image
8486
RELEASE_TESTING_ECR_ACCOUNT, e2e-test/${{ github.event.repository.name }}/python-k8s-release-testing-account
85-
MAIN_SERVICE_ENDPOINT, e2e-test/${{ github.event.repository.name }}/python-k8s-master-node-endpoint
86-
MASTER_NODE_SSH_KEY, e2e-test/${{ github.event.repository.name }}/python-k8s-ssh-key
87+
# MAIN_SERVICE_ENDPOINT, e2e-test/${{ github.event.repository.name }}/python-k8s-master-node-endpoint
88+
# MASTER_NODE_SSH_KEY, e2e-test/${{ github.event.repository.name }}/python-k8s-ssh-key
8789

8890
- name: Prepare and upload sample app deployment files
8991
working-directory: terraform/python/k8s/deploy/resources

‎.github/workflows/test.yml

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎terraform/java/ec2/asg/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ resource "aws_launch_configuration" "launch_configuration" {
141141
tmux send-keys -t traffic-generator "export MAIN_ENDPOINT=\"localhost:8080\"" C-m
142142
tmux send-keys -t traffic-generator "export REMOTE_ENDPOINT=\"${aws_instance.remote_service_instance.private_ip}\"" C-m
143143
tmux send-keys -t traffic-generator "export ID=\"${var.test_id}\"" C-m
144-
tmux send-keys -t traffic-generator "export CANARY_TYPE=\"${var.canary_type}\"" C-m
145144
tmux send-keys -t traffic-generator "npm start" C-m
146145
147146
EOF

‎terraform/java/ec2/default/main.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ resource "aws_instance" "main_service_instance" {
9494
}
9595
}
9696

97-
98-
9997
resource "null_resource" "main_service_setup" {
10098
connection {
10199
type = "ssh"
@@ -239,7 +237,6 @@ resource "null_resource" "traffic_generator_setup" {
239237
tmux send-keys -t traffic-generator "export MAIN_ENDPOINT=\"localhost:8080\"" C-m
240238
tmux send-keys -t traffic-generator "export REMOTE_ENDPOINT=\"${aws_instance.remote_service_instance.private_ip}\"" C-m
241239
tmux send-keys -t traffic-generator "export ID=\"${var.test_id}\"" C-m
242-
tmux send-keys -t traffic-generator "export CANARY_TYPE=\"${var.canary_type}\"" C-m
243240
tmux send-keys -t traffic-generator "npm start" C-m
244241
245242
EOF

‎terraform/java/eks/main.tf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,40 @@ resource "kubernetes_service" "sample_remote_app_service" {
216216
node_port = 30101
217217
}
218218
}
219+
}
220+
221+
resource "kubernetes_deployment" "traffic_generator" {
222+
metadata {
223+
name = "traffic-generator"
224+
namespace = var.test_namespace
225+
labels = {
226+
app = "traffic-generator"
227+
}
228+
}
229+
spec {
230+
replicas = 1
231+
selector {
232+
match_labels = {
233+
app = "traffic-generator"
234+
}
235+
}
236+
template {
237+
metadata {
238+
labels = {
239+
app = "traffic-generator"
240+
}
241+
}
242+
spec {
243+
container {
244+
name = "traffic-generator"
245+
image = "${var.account_id}.dkr.ecr.${var.aws_region}.amazonaws.com/e2e-test-resource:traffic-generator"
246+
image_pull_policy = "Always"
247+
env {
248+
name = "ID"
249+
value = var.test_id
250+
}
251+
}
252+
}
253+
}
254+
}
219255
}

‎terraform/java/eks/variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,7 @@ variable "rds_mysql_cluster_username" {
6060
variable "rds_mysql_cluster_password" {
6161
default = "password"
6262
}
63+
64+
variable "account_id" {
65+
default = "<AWS_ACCOUNT_ID>"
66+
}

‎terraform/java/k8s/deploy/main.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ resource "null_resource" "deploy" {
157157
kubectl set env -n sample-app-namespace deployment/traffic-generator MAIN_ENDPOINT=$(kubectl get pods -n sample-app-namespace --selector=app=sample-app -o jsonpath='{.items[0].status.podIP}'):8080
158158
kubectl set env -n sample-app-namespace deployment/traffic-generator REMOTE_ENDPOINT=$(kubectl get pod --selector=app=remote-app -n sample-app-namespace -o jsonpath='{.items[0].status.podIP}')
159159
kubectl set env -n sample-app-namespace deployment/traffic-generator ID=${var.test_id}
160-
kubectl set env -n sample-app-namespace deployment/traffic-generator CANARY_TYPE=java-k8s
161-
160+
162161
# Restart the traffic generator with the new configuration
163162
kubectl get pods -n sample-app-namespace --no-headers | grep '^traffic-generator' | awk '{print $1}' | xargs kubectl delete pod -n sample-app-namespace
164163

‎terraform/python/ec2/asg/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ resource "aws_launch_configuration" "launch_configuration" {
155155
tmux send-keys -t traffic-generator "export MAIN_ENDPOINT=\"localhost:8000\"" C-m
156156
tmux send-keys -t traffic-generator "export REMOTE_ENDPOINT=\"${aws_instance.remote_service_instance.private_ip}\"" C-m
157157
tmux send-keys -t traffic-generator "export ID=\"${var.test_id}\"" C-m
158-
tmux send-keys -t traffic-generator "export CANARY_TYPE=\"${var.canary_type}\"" C-m
159158
tmux send-keys -t traffic-generator "npm start" C-m
160159
161160
EOF

‎terraform/python/ec2/default/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ resource "null_resource" "traffic_generator_setup" {
252252
tmux send-keys -t traffic-generator "export MAIN_ENDPOINT=\"localhost:8000\"" C-m
253253
tmux send-keys -t traffic-generator "export REMOTE_ENDPOINT=\"${aws_instance.remote_service_instance.private_ip}\"" C-m
254254
tmux send-keys -t traffic-generator "export ID=\"${var.test_id}\"" C-m
255-
tmux send-keys -t traffic-generator "export CANARY_TYPE=\"${var.canary_type}\"" C-m
256255
tmux send-keys -t traffic-generator "npm start" C-m
257256
258257
EOF

0 commit comments

Comments
 (0)