chore: fix deployment conflicts (#3230)

rudderlabs · Apr 1, 2024 · 84cdf5f · 84cdf5f
1 parent eb7b197
commit 84cdf5f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/prepare-for-prod-dt-deploy.yml b/.github/workflows/prepare-for-prod-dt-deploy.yml
@@ -118,10 +118,9 @@ jobs:
           yq eval -i ".user-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" multi-tenant/multi-tenant.yaml
           git add multi-tenant/multi-tenant.yaml
 
-          cd ../../../../config-be-rudder-transformer
-          yq eval -i ".config-be-rudder-transformer.image.tag=\"$TAG_NAME\"" values.prod.yaml
-          yq eval -i ".config-be-rudder-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" values.prod.yaml
-          git add values.prod.yaml
+          cd ../../../../config-be-rudder-transformer/environment/prod
+          yq eval -i ".config-be-rudder-transformer.image.tag=\"$TAG_NAME\"" base.yaml
+          git add base.yaml
 
           git commit -m "chore: upgrade shared transformers to $TAG_NAME"
           git push -u origin shared-transformer-$TAG_NAME

diff --git a/.github/workflows/prepare-for-prod-ut-deploy.yml b/.github/workflows/prepare-for-prod-ut-deploy.yml
@@ -102,11 +102,10 @@ jobs:
           cd rudder-devops
           git checkout -b shared-user-transformer-$UT_TAG_NAME
 
-          cd helm-charts/config-be-rudder-transformer
+          cd helm-charts/config-be-rudder-transformer/environment/prod
 
-          yq eval -i ".config-be-user-transformer.image.tag=\"$UT_TAG_NAME\"" values.prod.yaml
-          yq eval -i ".config-be-user-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" values.prod.yaml
-          git add values.prod.yaml
+          yq eval -i ".config-be-user-transformer.image.tag=\"$UT_TAG_NAME\"" base.yaml
+          git add base.yaml
 
           git commit -m "chore: upgrade shared user-transformers to $UT_TAG_NAME"
           git push -u origin shared-user-transformer-$UT_TAG_NAME

diff --git a/.github/workflows/prepare-for-staging-deploy.yml b/.github/workflows/prepare-for-staging-deploy.yml
@@ -115,8 +115,7 @@ jobs:
             cd ../../../../config-be-rudder-transformer/environment/staging
             yq eval -i ".config-be-rudder-transformer.image.tag=\"$TAG_NAME\"" base.yaml
             yq eval -i ".config-be-user-transformer.image.tag=\"$TAG_NAME\"" base.yaml
-            git add values.staging.yaml
-
+            git add base.yaml
             git commit -m "chore: upgrade staging env transformers to \"$TAG_NAME\""
             git push -u origin $BRANCH_NAME
             gh pr create --fill