Skip to content

Commit

Permalink
chore(release): pull release/v1.35.0 into main (#2353)
Browse files Browse the repository at this point in the history
  • Loading branch information
krishna2020 authored Jul 11, 2023
2 parents 8066390 + fe7432b commit 3b5ec63
Show file tree
Hide file tree
Showing 70 changed files with 5,547 additions and 837 deletions.
56 changes: 16 additions & 40 deletions .github/workflows/prepare-for-prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ jobs:
echo "Tag Name: $tag_name"
echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
tag_name_ut="ut-$tag_name"
echo "UT Tag Name: $tag_name_ut"
echo "tag_name_ut=$tag_name_ut" >> $GITHUB_OUTPUT
build-transformer-image:
name: Build Transformer Docker Image - Prod
# Only merged pull requests from release candidate branches must trigger
Expand All @@ -59,29 +55,12 @@ jobs:
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

build-user-transformer-image:
name: Build User Transformer Docker Image - Prod
# Only merged pull requests from release candidate branches must trigger
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
needs: [generate-tag-names]
uses: ./.github/workflows/build-push-docker-image.yml
with:
build_tag: rudderstack/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
push_tags: rudderstack/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }},rudderstack/rudder-transformer:ut-latest,rudderlabs/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }},rudderlabs/rudder-transformer:ut-latest
img_tag: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
dockerfile: Dockerfile-ut-func
load_target: development
push_target: production
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

create-pull-request:
name: Update Helm Charts For Production and Create Pull Request
runs-on: ubuntu-latest
needs: [generate-tag-names, build-transformer-image, build-user-transformer-image]
needs: [generate-tag-names, build-transformer-image]
env:
TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name }}
UT_TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
TF_IMAGE_REPOSITORY: rudderstack/rudder-transformer
steps:
- name: Checkout
Expand All @@ -99,7 +78,6 @@ jobs:
- name: Print Docker Image Tags
run: |
echo "Transformer: $TAG_NAME"
echo "User Transformer: $UT_TAG_NAME"
- name: Clone Devops Repo
run: |
Expand All @@ -120,26 +98,25 @@ jobs:
cd rudder-devops
git checkout -b shared-transformer-$TAG_NAME
cd helm-charts/shared-services/per-az
yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" values.blue-release.yaml
yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" values.blue-release.yaml
yq eval -i ".rudder-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" values.blue-release.yaml
git add values.blue-release.yaml
cd helm-charts/shared-services/per-az/environment/production
yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" production.yaml
yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" production.yaml
yq eval -i ".rudder-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" production.yaml
git add production.yaml
yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" values.enterprise.yaml
yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" values.enterprise.yaml
yq eval -i ".rudder-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" values.enterprise.yaml
git add values.enterprise.yaml
yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" enterprise/enterprise.yaml
yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" enterprise/enterprise.yaml
yq eval -i ".rudder-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" enterprise/enterprise.yaml
git add enterprise/enterprise.yaml
yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" values.multi-tenant.yaml
yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" values.multi-tenant.yaml
yq eval -i ".user-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" values.multi-tenant.yaml
git add values.multi-tenant.yaml
yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" multi-tenant/multi-tenant.yaml
yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" multi-tenant/multi-tenant.yaml
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-user-transformer.image.tag=\"$TAG_NAME\"" values.prod.yaml
yq eval -i ".config-be-user-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" values.prod.yaml
yq eval -i ".config-be-rudder-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" values.prod.yaml
git add values.prod.yaml
git commit -m "chore: upgrade shared transformers to $TAG_NAME"
Expand All @@ -156,11 +133,10 @@ jobs:
cd customer-objects/multi-tenant-us
yq eval -i ".spec.transformer.image.version=\"$TAG_NAME\"" hostedmtedmt.yaml
yq eval -i ".spec.user_transformer.image.version=\"$TAG_NAME\"" hostedmtedmt.yaml
yq eval -i ".spec.transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" hostedmtedmt.yaml
git add hostedmtedmt.yaml
git commit -m "chore: upgrade hosted transformer to $TAG_NAME"
git push -u origin hosted-transformer-$TAG_NAME
hub pull-request -m "chore: upgrade hosted transformer to $TAG_NAME"
hub pull-request -m "chore: upgrade hosted transformer to $TAG_NAME"
131 changes: 131 additions & 0 deletions .github/workflows/prepare-for-prod-ut-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
name: Prepare for Production Environment Deployment

on:
push:
branches:
- main
pull_request:
types:
- closed
branches:
- main

jobs:
report-coverage:
name: Report Code Coverage
if: github.event_name == 'push'
uses: ./.github/workflows/report-code-coverage.yml
secrets:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

generate-tag-names:
runs-on: ubuntu-latest
name: Generate Tag Names
# Only merged pull requests from release candidate branches must trigger
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
outputs:
tag_name_ut: ${{ steps.gen_tag_names.outputs.tag_name_ut }}
steps:
- name: Checkout
uses: actions/[email protected]
with:
fetch-depth: 1

- name: Generate Tag Names
id: gen_tag_names
run: |
tag_name=$(jq -r .version package.json)
echo "Tag Name: $tag_name"
echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
tag_name_ut="ut-$tag_name"
echo "UT Tag Name: $tag_name_ut"
echo "tag_name_ut=$tag_name_ut" >> $GITHUB_OUTPUT
build-user-transformer-image:
name: Build User Transformer Docker Image - Prod
# Only merged pull requests from release candidate branches must trigger
if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
needs: [generate-tag-names]
uses: ./.github/workflows/build-push-docker-image.yml
with:
build_tag: rudderstack/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
push_tags: rudderstack/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }},rudderstack/rudder-transformer:ut-latest,rudderlabs/rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }},rudderlabs/rudder-transformer:ut-latest
img_tag: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
dockerfile: Dockerfile-ut-func
load_target: development
push_target: production
secrets:
DOCKERHUB_PROD_TOKEN: ${{ secrets.DOCKERHUB_PROD_TOKEN }}

create-pull-request:
name: Update Helm Charts For Production and Create Pull Request
runs-on: ubuntu-latest
needs: [generate-tag-names, build-user-transformer-image]
env:
UT_TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
TF_IMAGE_REPOSITORY: rudderstack/rudder-transformer
steps:
- name: Checkout
uses: actions/[email protected]
with:
fetch-depth: 1

# In order to make a commit, we need to initialize a user.
# You may choose to write something less generic here if you want, it doesn't matter functionality wise.
- name: Initialize Mandatory Git Config
run: |
git config --global user.name "GitHub Actions"
git config --global user.email "[email protected]"
- name: Print Docker Image Tags
run: |
echo "User Transformer: $UT_TAG_NAME"
- name: Clone Devops Repo
run: |
git clone https://${{secrets.PAT}}@github.com/rudderlabs/rudder-devops.git
- name: Extract branch name
id: extract_branch_name
run: |
cd rudder-devops
branch_name=$(git rev-parse --abbrev-ref HEAD)
echo "branch_name=$branch_name"
echo "branch_name=$branch_name" >> $GITHUB_OUTPUT
- name: Update Helm Charts and Raise Pull Request
env:
GITHUB_TOKEN: ${{ secrets.PAT }}
run: |
cd rudder-devops
git checkout -b shared-user-transformer-$UT_TAG_NAME
cd helm-charts/shared-services/per-az/environment/production
cd ../../config-be-rudder-transformer
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
git commit -m "chore: upgrade shared user-transformers to $UT_TAG_NAME"
git push -u origin shared-user-transformer-$UT_TAG_NAME
hub pull-request -m "chore: upgrade shared user-transformers to $UT_TAG_NAME"
- name: Update Helm Chart and Raise Pull Request For Hosted Transformer
env:
GITHUB_TOKEN: ${{ secrets.PAT }}
run: |
cd rudder-devops
git checkout -b hosted-user-transformer-$UT_TAG_NAME ${{steps.extract_branch_name.outputs.branch_name}}
cd customer-objects/multi-tenant-us
yq eval -i ".spec.user_transformer.image.version=\"$UT_TAG_NAME\"" hostedmtedmt.yaml
yq eval -i ".spec.transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" hostedmtedmt.yaml
git add hostedmtedmt.yaml
git commit -m "chore: upgrade hosted user-transformer to $UT_TAG_NAME"
git push -u origin hosted-user-transformer-$UT_TAG_NAME
hub pull-request -m "chore: upgrade hosted user-transformer to $UT_TAG_NAME"
8 changes: 4 additions & 4 deletions .github/workflows/prepare-for-staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ jobs:
else
git checkout -b $BRANCH_NAME
cd helm-charts/shared-services/per-az
yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" values.staging.yaml
yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" values.staging.yaml
git add values.staging.yaml
cd helm-charts/shared-services/per-az/environment/staging
yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" staging.yaml
yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" staging.yaml
git add staging.yaml
cd ../../config-be-rudder-transformer
yq eval -i ".config-be-rudder-transformer.image.tag=\"$TAG_NAME\"" values.staging.yaml
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.35.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.34.1...v1.35.0) (2023-07-07)


### Features

* custom page event name amplitude ([#2284](https://github.com/rudderlabs/rudder-transformer/issues/2284)) ([01e5bf2](https://github.com/rudderlabs/rudder-transformer/commit/01e5bf24301c988b57ab456d2ad624686f20c05d))
* factorsAI page and group call support ([#2289](https://github.com/rudderlabs/rudder-transformer/issues/2289)) ([51f9009](https://github.com/rudderlabs/rudder-transformer/commit/51f9009270c38dbe6bec76056bdae43f9921de93))


### Bug Fixes

* convert epoch timestamp into gaoc accepted format ([#2344](https://github.com/rudderlabs/rudder-transformer/issues/2344)) ([4247c74](https://github.com/rudderlabs/rudder-transformer/commit/4247c742d96c8fd91d593d9558974000f25dd3e2))
* **facebook_pixel:** name conversion to string ([#2338](https://github.com/rudderlabs/rudder-transformer/issues/2338)) ([5530990](https://github.com/rudderlabs/rudder-transformer/commit/553099068835d3af24f28b983d58f9d8dacb80d2))
* incorrect usage of histogram as counter ([#2335](https://github.com/rudderlabs/rudder-transformer/issues/2335)) ([654f0ad](https://github.com/rudderlabs/rudder-transformer/commit/654f0adca54357cedaa07235b3f18cebf9e403c3))
* **iterable:** update addition of default value for some fields ([#2310](https://github.com/rudderlabs/rudder-transformer/issues/2310)) ([0f1ebba](https://github.com/rudderlabs/rudder-transformer/commit/0f1ebba73bbe760ae4d9d66f9f46fffb96ca27fc))


### [1.34.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.34.0...v1.34.1) (2023-07-07)


Expand Down
Loading

0 comments on commit 3b5ec63

Please sign in to comment.