From f6ebb072b6bb05e4fe59e501951233b11f7a3ba1 Mon Sep 17 00:00:00 2001 From: Zhonghao Zhao Date: Tue, 16 Apr 2024 13:34:03 -0700 Subject: [PATCH 1/2] Update adot image patch index. --- .github/workflows/application-signals-python-e2e-eks-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/application-signals-python-e2e-eks-test.yml b/.github/workflows/application-signals-python-e2e-eks-test.yml index 77695a17c..55160d22e 100644 --- a/.github/workflows/application-signals-python-e2e-eks-test.yml +++ b/.github/workflows/application-signals-python-e2e-eks-test.yml @@ -162,7 +162,7 @@ jobs: if [ "${{ inputs.caller-workflow-name }}" == "main-build" ]; then echo "Patching staging adot image for main build:" execute_and_retry 2 "kubectl patch deploy -namazon-cloudwatch amazon-cloudwatch-observability-controller-manager --type='json' \ - -p='[{"op": \"replace\", \"path\": \"/spec/template/spec/containers/0/args/0\", \"value\": \"--auto-instrumentation-python-image=${{ inputs.application-signals-adot-image }}:${{ inputs.application-signals-adot-image-tag }}\"}]'" + -p='[{"op": \"replace\", \"path\": \"/spec/template/spec/containers/0/args/2\", \"value\": \"--auto-instrumentation-python-image=${{ inputs.application-signals-adot-image }}:${{ inputs.application-signals-adot-image-tag }}\"}]'" execute_and_retry 2 "kubectl delete pods --all -n amazon-cloudwatch" execute_and_retry 2 "kubectl wait --for=condition=Ready pod --all -n amazon-cloudwatch" fi From 850be9f525ed6a4e12847bb95e649ffb473abdb2 Mon Sep 17 00:00:00 2001 From: Zhonghao Zhao Date: Tue, 16 Apr 2024 14:53:39 -0700 Subject: [PATCH 2/2] Syntax fix. --- .github/workflows/application-signals-python-e2e-eks-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/application-signals-python-e2e-eks-test.yml b/.github/workflows/application-signals-python-e2e-eks-test.yml index 55160d22e..86fb24db8 100644 --- a/.github/workflows/application-signals-python-e2e-eks-test.yml +++ b/.github/workflows/application-signals-python-e2e-eks-test.yml @@ -159,7 +159,7 @@ jobs: ${{ env.PYTHON_SAMPLE_APP_NAMESPACE }} && \ aws eks update-kubeconfig --name ${{ inputs.test-cluster-name }} --region ${{ inputs.aws-region }}" - if [ "${{ inputs.caller-workflow-name }}" == "main-build" ]; then + if [ "${{ inputs.caller-workflow-name }}" = "main-build" ]; then echo "Patching staging adot image for main build:" execute_and_retry 2 "kubectl patch deploy -namazon-cloudwatch amazon-cloudwatch-observability-controller-manager --type='json' \ -p='[{"op": \"replace\", \"path\": \"/spec/template/spec/containers/0/args/2\", \"value\": \"--auto-instrumentation-python-image=${{ inputs.application-signals-adot-image }}:${{ inputs.application-signals-adot-image-tag }}\"}]'"