update to test helm template

Author: JayPolanco

.github/workflows/eks-performance-cluster-addon-install.yml

@@ -85,61 +85,62 @@ jobs:
     outputs:
       should_continue: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'schedule') }}
 
-  # Get latest operator commit from github repo
-  GetLatestOperatorCommitSHA:
-    needs: check-trigger
-    if: ${{ needs.check-trigger.outputs.should_continue == 'true' }}
-    runs-on: ubuntu-latest
-    outputs:
-      operator_commit_sha: ${{steps.get_latest_sha.outputs.operator_sha}}
-      operator_repo_name: ${{env.OPERATOR_GITHUB_REPO_NAME}}
-    steps:
-      - name: Checkout the target repo
-        uses: actions/checkout@v4
-        with:
-          repository: ${{env.OPERATOR_GITHUB_REPO_NAME}}
-          ref: ${{ inputs.operator-branch || 'main' }}
-          path: operator-repo
-
-      - name: Get latest commit SHA
-        id: get_latest_sha
-        run: |
-          cd operator-repo
-          latest_sha=$(git rev-parse HEAD)
-          echo "operator_sha=$latest_sha" >> "$GITHUB_OUTPUT"
-
-  # Build and upload agent image to ECR repo
-  BuildAgent:
-    needs: check-trigger
-    if: ${{ needs.check-trigger.outputs.should_continue == 'true' }}
-    uses: ./.github/workflows/build-test-artifacts.yml
-    concurrency:
-      group: "Build-Test-Artifacts-${{github.ref_name}}"
-      cancel-in-progress: true
-    secrets: inherit
-    permissions:
-      id-token: write
-      contents: read
-    with:
-      test-image-before-upload: false
-
-  # Build and upload operator image to ECR repo
-  BuildOperator:
-    needs: [ check-trigger, GetLatestOperatorCommitSHA ]
-    if: ${{ needs.check-trigger.outputs.should_continue == 'true' }}
-    uses: aws/amazon-cloudwatch-agent-operator/.github/workflows/build-and-upload.yml@main
-    concurrency:
-      group: ${{ github.workflow }}-operator-${{ inputs.operator-branch || 'main' }}
-      cancel-in-progress: true
-    secrets: inherit
-    with:
-      tag: ${{needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha}}
-      target-sha: ${{needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha}}
-      repository: ${{needs.GetLatestOperatorCommitSHA.outputs.operator_repo_name}}
-      test-image-before-upload: false
+#  # Get latest operator commit from github repo
+#  GetLatestOperatorCommitSHA:
+#    needs: check-trigger
+#    if: ${{ needs.check-trigger.outputs.should_continue == 'true' }}
+#    runs-on: ubuntu-latest
+#    outputs:
+#      operator_commit_sha: ${{steps.get_latest_sha.outputs.operator_sha}}
+#      operator_repo_name: ${{env.OPERATOR_GITHUB_REPO_NAME}}
+#    steps:
+#      - name: Checkout the target repo
+#        uses: actions/checkout@v4
+#        with:
+#          repository: ${{env.OPERATOR_GITHUB_REPO_NAME}}
+#          ref: ${{ inputs.operator-branch || 'main' }}
+#          path: operator-repo
+#
+#      - name: Get latest commit SHA
+#        id: get_latest_sha
+#        run: |
+#          cd operator-repo
+#          latest_sha=$(git rev-parse HEAD)
+#          echo "operator_sha=$latest_sha" >> "$GITHUB_OUTPUT"
+#
+#  # Build and upload agent image to ECR repo
+#  BuildAgent:
+#    needs: check-trigger
+#    if: ${{ needs.check-trigger.outputs.should_continue == 'true' }}
+#    uses: ./.github/workflows/build-test-artifacts.yml
+#    concurrency:
+#      group: "Build-Test-Artifacts-${{github.ref_name}}"
+#      cancel-in-progress: true
+#    secrets: inherit
+#    permissions:
+#      id-token: write
+#      contents: read
+#    with:
+#      test-image-before-upload: false
+#
+#  # Build and upload operator image to ECR repo
+#  BuildOperator:
+#    needs: [ check-trigger, GetLatestOperatorCommitSHA ]
+#    if: ${{ needs.check-trigger.outputs.should_continue == 'true' }}
+#    uses: aws/amazon-cloudwatch-agent-operator/.github/workflows/build-and-upload.yml@main
+#    concurrency:
+#      group: ${{ github.workflow }}-operator-${{ inputs.operator-branch || 'main' }}
+#      cancel-in-progress: true
+#    secrets: inherit
+#    with:
+#      tag: ${{needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha}}
+#      target-sha: ${{needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha}}
+#      repository: ${{needs.GetLatestOperatorCommitSHA.outputs.operator_repo_name}}
+#      test-image-before-upload: false
 
   install-helm:
-    needs: [ check-trigger, BuildAgent, BuildOperator ]
+    needs: [ check-trigger ]
+#    needs: [ check-trigger, BuildAgent, BuildOperator ]
     if: ${{ needs.check-trigger.outputs.should_continue == 'true' }}
     runs-on: ubuntu-latest
     permissions:
@@ -185,18 +186,30 @@ jobs:
             helm uninstall amazon-cloudwatch-observability -n amazon-cloudwatch || echo "Chart not found or already removed"
           else
             echo "Node count is $NODE_COUNT, installing/updating Helm chart"
-            helm upgrade --install amazon-cloudwatch-observability \
+            helm template amazon-cloudwatch-observability \
               ./helm-charts/charts/amazon-cloudwatch-observability \
               --namespace amazon-cloudwatch \
               --create-namespace \
-              --set clusterName=${{ inputs.cluster_name ||env.CLUSTER_NAME }} \
-              --set region=${{ inputs.region || env.AWS_REGION }} \
-              --set agent.image.repository=${{ inputs.cloudwatch_agent_repository || env.AGENT_ECR_TEST_REPO }} \
-              --set agent.image.tag=${{ inputs.cloudwatch_agent_tag || github.sha }} \
-              --set agent.image.repositoryDomainMap.public=${{ steps.login-ecr.outputs.registry }} \
-              --set manager.image.repository=${{ inputs.cloudwatch_agent_operator_repository || env.OPERATOR_ECR_TEST_REPO }} \
-              --set manager.image.tag=${{ inputs.cloudwatch_agent_operator_tag || needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }} \
-              --set manager.image.repositoryDomainMap.public=${{ steps.login-ecr.outputs.registry }}
+              --set clusterName="eks-performance" \
+              --set region="us-west-2" \
+              --set agent.image.repository="cloudwatch-agent" \
+              --set agent.image.tag="latest" \
+              --set agent.image.repositoryDomainMap.public="public.ecr.aws/cloudwatch-agent" \
+              --set manager.image.repository="cloudwatch-agent-operator" \                
+              --set manager.image.tag="latest" \
+              --set manager.image.repositoryDomainMap.public="public.ecr.aws/cloudwatch-agent"
+#            helm upgrade --install amazon-cloudwatch-observability \
+#              ./helm-charts/charts/amazon-cloudwatch-observability \
+#              --namespace amazon-cloudwatch \
+#              --create-namespace \
+#              --set clusterName=${{ inputs.cluster_name ||env.CLUSTER_NAME }} \
+#              --set region=${{ inputs.region || env.AWS_REGION }} \
+#              --set agent.image.repository=${{ inputs.cloudwatch_agent_repository || env.AGENT_ECR_TEST_REPO }} \
+#              --set agent.image.tag=${{ inputs.cloudwatch_agent_tag || github.sha }} \
+#              --set agent.image.repositoryDomainMap.public=${{ steps.login-ecr.outputs.registry }} \
+#              --set manager.image.repository=${{ inputs.cloudwatch_agent_operator_repository || env.OPERATOR_ECR_TEST_REPO }} \
+#              --set manager.image.tag=${{ inputs.cloudwatch_agent_operator_tag || needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }} \
+#              --set manager.image.repositoryDomainMap.public=${{ steps.login-ecr.outputs.registry }}
           fi
 
   cleanup-on-failure: