Skip to content

Commit 48a1bff

Browse files
chore: remove AWS_ROLE_ARN from deployment workflow and update deploy… (#41039)
… script for node affinity ### Changes Made - Removed `AWS_ROLE_ARN` from the environment variables in the GitHub Actions workflow for deploying the Helm chart. - Cleaned up the `deploy_preview.sh` script by removing commented-out code related to role assumption. - Added a new `dp-node-affinity-values.yaml` file to define node affinity and tolerations for deployment. These changes streamline the deployment process and enhance the configuration for node scheduling. ## Description > [!TIP] > _Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team)._ > > _Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR._ Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > If you modify the content in this section, you are likely to disrupt the CI result for your PR. <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No
1 parent 5f1dbb3 commit 48a1bff

3 files changed

Lines changed: 17 additions & 13 deletions

File tree

.github/workflows/on-demand-build-docker-image-deploy-preview.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ jobs:
261261
262262
- name: Deploy Helm chart
263263
env:
264-
AWS_ROLE_ARN: ${{ secrets.APPSMITH_EKS_AWS_ROLE_ARN }}
265264
AWS_ACCESS_KEY_ID: ${{ secrets.APPSMITH_CI_AWS_SECRET_ACCESS_KEY_ID }}
266265
AWS_SECRET_ACCESS_KEY: ${{ secrets.APPSMITH_CI_AWS_SECRET_ACCESS_KEY }}
267266
IMAGE_HASH: ${{ needs.push-image.outputs.imageHash }}

scripts/deploy_preview.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,12 @@ export cluster_name=uatx-cluster
1616
echo "[default]
1717
region = $region
1818
output = json
19-
# [profile eksci]
20-
# role_arn = $AWS_ROLE_ARN
21-
# output = json
22-
# region = $region
23-
# source_profile = default" > ~/.aws/config
2419
2520
echo "Region: $region"
2621
echo "Cluster name: $cluster_name"
2722
echo "Pull Request Number: $PULL_REQUEST_NUMBER"
2823
echo "DP_EFS_ID: $DP_EFS_ID"
2924
30-
# sts_output="$(aws sts assume-role --role-arn "$AWS_ROLE_ARN" --role-session-name ekscisession)"
31-
32-
# export AWS_ACCESS_KEY_ID="$(echo "$sts_output" | jq -r .Credentials.AccessKeyId)"
33-
# export AWS_SECRET_ACCESS_KEY="$(echo "$sts_output" | jq -r .Credentials.SecretAccessKey)"
34-
# export AWS_SESSION_TOKEN="$(echo "$sts_output" | jq -r .Credentials.SessionToken)"
35-
3625
export NAMESPACE="$edition$PULL_REQUEST_NUMBER"
3726
export CHARTNAME="$edition$PULL_REQUEST_NUMBER"
3827
export SECRET="$edition$PULL_REQUEST_NUMBER"
@@ -117,4 +106,5 @@ helm upgrade -i "$CHARTNAME" "appsmith-ee/$HELMCHART" -n "$NAMESPACE" --create-n
117106
--set applicationConfig.APPSMITH_CARBON_API_BASE_PATH="$APPSMITH_CARBON_API_BASE_PATH" \
118107
--set applicationConfig.APPSMITH_AI_SERVER_MANAGED_HOSTING="$APPSMITH_AI_SERVER_MANAGED_HOSTING" \
119108
--set applicationConfig.IN_DOCKER='$IN_DOCKER' \
120-
--set applicationConfig.APPSMITH_CUSTOMER_PORTAL_URL="https://release-customer.appsmith.com"
109+
--set applicationConfig.APPSMITH_CUSTOMER_PORTAL_URL="https://release-customer.appsmith.com" \
110+
-f dp-node-affinity-values.yaml
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
affinity:
2+
nodeAffinity:
3+
requiredDuringSchedulingIgnoredDuringExecution:
4+
nodeSelectorTerms:
5+
- matchExpressions:
6+
- key: instance_name
7+
operator: In
8+
values:
9+
- uatx-shared
10+
11+
tolerations:
12+
- key: instance_name
13+
operator: Equal
14+
value: uatx-shared
15+
effect: NoSchedule

0 commit comments

Comments
 (0)