edited yml

aws · Dec 7, 2023 · 0508aa2 · 0508aa2
1 parent de3bb0f
commit 0508aa2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/operator-integration-test.yml b/.github/workflows/operator-integration-test.yml
@@ -65,10 +65,10 @@ jobs:
 #            tags: ${{ env.ECR_OPERATOR_STAGING_IMAGE }}
 #            platforms: linux/amd64, linux/arm64
 
-      - name: Update manager.yaml
-        run: |
-          sed -i "s|\${OPERATOR_IMAGE}|$ECR_OPERATOR_STAGING_IMAGE|" config/manager/kustomization.yaml
-          cat config/manager/kustomization.yaml
+#      - name: Update manager.yaml
+#        run: |
+#          sed -i "s|\${OPERATOR_IMAGE}|$ECR_OPERATOR_STAGING_IMAGE|" config/manager/kustomization.yaml
+#          cat config/manager/kustomization.yaml
 
       - name: Verify Terraform version
         run: terraform --version
@@ -86,7 +86,7 @@ jobs:
             if terraform apply --auto-approve; then
                 cd -
                 kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.12.0/cert-manager.yaml
-                make kustomize && make release-artifacts IMG=506463145083.dkr.ecr.us-west-2.amazonaws.com/cwagent-operator-pre-release:latest
+                make deploy
                 sleep 60
                 cd integration-tests/terraform/testbuild
                 kubectl apply -f agent_daemon_set.yaml

diff --git a/integration-tests/terraform/testbuild/ns-annotation-test-deployment.yaml b/integration-tests/terraform/testbuild/ns-annotation-test-deployment.yaml
@@ -17,5 +17,7 @@ spec:
       containers:
         - name: nginx
           image: nginx:1.14.2
+          args:
+          - "--auto-instrumentation-java-image=public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.31.1"
       restartPolicy: Always
 status: {}
diff --git a/integration-tests/terraform/testbuild/test-deployment.yaml b/integration-tests/terraform/testbuild/test-deployment.yaml
@@ -16,5 +16,7 @@ spec:
       containers:
         - name: nginx
           image: nginx:1.14.2
+          args:
+          - "--auto-instrumentation-java-image=public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v1.31.1"
       restartPolicy: Always
 status: {}