Skip to content

Commit 028a559

Browse files
committed
update helm install to use hardcoded agent image and helm branch
1 parent bc3bc36 commit 028a559

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,11 @@ jobs:
173173
run: |
174174
aws eks update-kubeconfig --name $CLUSTER_NAME --region $AWS_REGION
175175
176+
# TODO: Revert to using main helm branch when changes from leader-election are merged in
176177
- name: Clone Helm Charts Repository
177178
run: |
178179
rm -rf ./helm-charts
179-
git clone -b ${{ inputs.helm-charts-branch || 'main' }} https://github.com/aws-observability/helm-charts.git ./helm-charts
180+
git clone -b ${{ inputs.helm-charts-branch || 'sky333999/leader-election' }} https://github.com/aws-observability/helm-charts.git ./helm-charts
180181
181182
- name: Clone Test Repo
182183
uses: actions/checkout@v4
@@ -185,17 +186,14 @@ jobs:
185186
ref: ${{ env.CWA_GITHUB_TEST_REPO_BRANCH }}
186187
path: ./test-repo
187188

188-
- name: Label nodes for CloudWatch Agent targeting
189-
run: |
190-
kubectl label nodes -l 'node.kubernetes.io/instance-type=t3.medium' cwagent-target="true"
191-
192189
- name: Replace hostname in override files
193190
run: |
194191
HOSTNAME=$(kubectl get nodes -l eks.amazonaws.com/nodegroup=$CLUSTER_NAME-leader-node -o jsonpath='{.items[0].metadata.name}')
195192
for file in ./test-repo/test/performance/eks/resources/leader_election_overrides/*; do
196193
sed -i "s/<hostname>/$HOSTNAME/g" "$file"
197194
done
198195
196+
# TODO: Revert to using workflow built agent image once required changes are made on main branch
199197
- name: Check node count and manage Helm chart
200198
run: |
201199
NODE_COUNT=$(kubectl get nodes --no-headers | wc -l)
@@ -222,9 +220,9 @@ jobs:
222220
--create-namespace \
223221
--set clusterName=${{ inputs.cluster_name ||env.CLUSTER_NAME }} \
224222
--set region=${{ inputs.region || env.AWS_REGION }} \
225-
--set agent.image.repository=${{ inputs.cloudwatch_agent_repository || env.AGENT_ECR_TEST_REPO }} \
226-
--set agent.image.tag=${{ inputs.cloudwatch_agent_tag || github.sha }} \
227-
--set agent.image.repositoryDomainMap.public=${{ steps.login-ecr.outputs.registry }} \
223+
--set agent.image.repository="cloudwatch-agent" \
224+
--set agent.image.tag="latest" \
225+
--set agent.image.repositoryDomainMap.public="public.ecr.aws/q4e2d9n7" \
228226
--set manager.image.repository=${{ inputs.cloudwatch_agent_operator_repository || env.OPERATOR_ECR_TEST_REPO }} \
229227
--set manager.image.tag=${{ inputs.cloudwatch_agent_operator_tag || needs.GetLatestOperatorCommitSHA.outputs.operator_commit_sha }} \
230228
--set manager.image.repositoryDomainMap.public=${{ steps.login-ecr.outputs.registry }} \

0 commit comments

Comments
 (0)