Merge branch 'main' of https://github.com/Jeel-mehta/amazon-cloudwatc…

…h-agent
aws · Jan 28, 2025 · 53a4b64 · 53a4b64
2 parents 6fd1e7c + f011798
commit 53a4b64
Show file tree

Hide file tree

Showing 34 changed files with 2,149 additions and 1,025 deletions.
diff --git a/.github/workflows/deploy-canary.yml b/.github/workflows/deploy-canary.yml
@@ -40,6 +40,9 @@ jobs:
           role-to-assume: ${{ env.TERRAFORM_AWS_ASSUME_ROLE }}
           aws-region: us-west-2
 
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+
       - name: Terminate Last Canary
         run: |
           if aws s3api wait object-exists --bucket ${S3_INTEGRATION_BUCKET} --key canary/al2/terraform.tfstate ;
@@ -51,6 +54,10 @@ jobs:
             terraform destroy -auto-approve
             aws s3api delete-object --bucket ${S3_INTEGRATION_BUCKET} --key canary/al2/terraform.tfstate
           fi
+
+      - name: Verify Terraform version
+        run: terraform --version
+
       # @TODO we can add a matrix in the future but for alpha we will only deploy to al2
       - name: Terraform apply
         uses: nick-fields/retry@v2

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -14,6 +14,8 @@ env:
   OPERATOR_GITHUB_REPO_NAME: "aws/amazon-cloudwatch-agent-operator"
 
 on:
+  schedule:
+    - cron: '0 17 * * 1'
   workflow_dispatch:
     inputs:
       region:
@@ -47,7 +49,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: ${{env.OPERATOR_GITHUB_REPO_NAME}}
-          ref: ${{inputs.operator-branch}}
+          ref: ${{ inputs.operator-branch || 'main' }}
           path: operator-repo
 
       - name: Get latest commit SHA
@@ -73,7 +75,7 @@ jobs:
     needs: [GetLatestOperatorCommitSHA]
     uses: aws/amazon-cloudwatch-agent-operator/.github/workflows/build-and-upload.yml@main
     concurrency:
-      group: ${{ github.workflow }}-operator-${{ inputs.operator-branch}}
+      group: ${{ github.workflow }}-operator-${{ inputs.operator-branch || 'main' }}
       cancel-in-progress: true
     secrets: inherit
     with:
@@ -165,8 +167,8 @@ jobs:
       cloudwatch_agent_tag: ${{ github.sha }}
       cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
       cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
-      region: ${{ inputs.region }}
-      helm_charts_branch: ${{ inputs.helm-charts-branch }}
+      region: ${{ inputs.region || 'us-west-2' }}
+      helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
       terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
       agent_config: resources/cwagent_configs/jvm_tomcat.json
       sample_app: resources/sample_apps/tomcat.yaml
@@ -187,8 +189,8 @@ jobs:
       cloudwatch_agent_tag: ${{ github.sha }}
       cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
       cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
-      region: ${{ inputs.region }}
-      helm_charts_branch: ${{ inputs.helm-charts-branch }}
+      region: ${{ inputs.region || 'us-west-2' }}
+      helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
       terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
       agent_config: resources/cwagent_configs/kafka.json
       sample_app: resources/sample_apps/kafka.yaml
@@ -209,8 +211,8 @@ jobs:
       cloudwatch_agent_tag: ${{ github.sha }}
       cloudwatch_agent_operator_repository: ${{ needs.OutputEnvVariables.outputs.ECR_OPERATOR_REPO }}
       cloudwatch_agent_operator_tag: ${{ needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }}
-      region: ${{ inputs.region }}
-      helm_charts_branch: ${{ inputs.helm-charts-branch }}
+      region: ${{ inputs.region || 'us-west-2' }}
+      helm_charts_branch: ${{ inputs.helm-charts-branch || 'main' }}
       terraform_assume_role: ${{ vars.TERRAFORM_AWS_ASSUME_ROLE }}
       agent_config: resources/cwagent_configs/containerinsights.json
       sample_app: resources/sample_apps/tomcat.yaml

diff --git a/.github/workflows/ec2-integration-test.yml b/.github/workflows/ec2-integration-test.yml
@@ -65,23 +65,19 @@ jobs:
           aws-region: ${{inputs.region}}
           role-duration-seconds: ${{ env.TERRAFORM_AWS_ASSUME_ROLE_DURATION }}
 
-      - name: Cache if success
-        id: cache_if_success
-        uses: actions/cache@v3
-        with:
-          path: go.mod
-          key: ${{inputs.region}}-${{ github.sha }}-${{ matrix.arrays.os }}-${{ matrix.arrays.arc }}-${{ matrix.arrays.test_dir }}
-
       - name: Echo Test Info
         run: |
           echo run cache_if_success os ${{ matrix.arrays.os }} arc ${{ matrix.arrays.arc }} test dir ${{ matrix.arrays.test_dir }}
           echo localstack input ${{ inputs.localstack_host }}
+
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+
       - name: Verify Terraform version
         run: terraform --version
 
       # nick-fields/retry@v2 starts at base dir
       - name: Terraform apply
-        if: steps.cache_if_success.outputs.cache-hit != 'true'
         uses: nick-fields/retry@v2
         with:
           max_attempts: 2
@@ -93,7 +89,7 @@ jobs:
             else
               cd ${{inputs.test_dir}}
             fi
-            
+
             terraform init
             if terraform apply --auto-approve \
               -var="ssh_key_value=${{env.PRIVATE_KEY}}" -var="github_test_repo=${{ inputs.test_repo_url }}" \

diff --git a/.github/workflows/eks-e2e-test.yml b/.github/workflows/eks-e2e-test.yml
@@ -90,24 +90,17 @@ jobs:
           aws-region: ${{ inputs.region }}
           role-duration-seconds: ${{ env.TERRAFORM_AWS_ASSUME_ROLE_DURATION }}
 
-      - name: Cache if success
-        id: cache_if_success
-        uses: actions/cache@v3
-        with:
-          path: go.mod
-          key: ${{inputs.region}}-${{ github.sha }}-${{ matrix.arrays.os }}-${{ matrix.arrays.arc }}-${{ matrix.arrays.test_dir }}
-
       - name: Login ECR
         id: login-ecr
-        if: steps.cache_if_success.outputs.cache-hit != 'true'
         uses: aws-actions/amazon-ecr-login@v2
 
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+
       - name: Verify Terraform version
-        if: steps.cache_if_success.outputs.cache-hit != 'true'
         run: terraform --version
 
       - name: Terraform apply
-        if: steps.cache_if_success.outputs.cache-hit != 'true'
         uses: nick-fields/retry@v2
         with:
           max_attempts: 3
@@ -144,7 +137,7 @@ jobs:
             else
               terraform destroy --auto-approve && exit 1
             fi
-            
+
       - name: Terraform destroy
         if: ${{ cancelled() || failure() }}
         uses: nick-fields/retry@v2