From e9a0f79f62ff28d04c19e37b16d91c5d7fa72afa Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Tue, 4 Feb 2025 17:42:09 -0800 Subject: [PATCH 1/6] chore: switch to parallelgc from zgc --- charts/nr-metabase/templates/metabase/configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/nr-metabase/templates/metabase/configmap.yaml b/charts/nr-metabase/templates/metabase/configmap.yaml index 80baccc..2ae246f 100644 --- a/charts/nr-metabase/templates/metabase/configmap.yaml +++ b/charts/nr-metabase/templates/metabase/configmap.yaml @@ -70,7 +70,7 @@ data: if [ -f /config/log4j2.xml ]; then - java -server -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseZGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:+ExitOnOutOfMemoryError -Dlog4j.configurationFile=file:/config/log4j2.xml -jar metabase.jar + java -server -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseParallelGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=200m -XX:+ExitOnOutOfMemoryError -Dlog4j.configurationFile=file:/config/log4j2.xml -jar metabase.jar else - java -server -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseZGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:+ExitOnOutOfMemoryError -jar metabase.jar + java -server -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseParallelGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=200m -XX:+ExitOnOutOfMemoryError -jar metabase.jar fi From 81537f30c0ec09779bccc5575453397aa2654220 Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:10:03 -0800 Subject: [PATCH 2/6] chore: update metabase to 52.9 --- charts/nr-metabase/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nr-metabase/values.yaml b/charts/nr-metabase/values.yaml index 67cfce9..289de92 100644 --- a/charts/nr-metabase/values.yaml +++ b/charts/nr-metabase/values.yaml @@ -24,7 +24,7 @@ metabase: # the below is for renovate to keep pushing PRs, so that it keeps getting updated. metabaseImage: repository: metabase/metabase - tag: v0.52.8 + tag: v0.52.9 containerPort: 3000 environment: production service: From 97b8bdeec5ac2bd23437654db978dfe37c2f1276 Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:16:48 -0800 Subject: [PATCH 3/6] fix: conditionals --- .github/workflows/on-pr-main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-pr-main.yml b/.github/workflows/on-pr-main.yml index d846988..b81db9a 100644 --- a/.github/workflows/on-pr-main.yml +++ b/.github/workflows/on-pr-main.yml @@ -28,10 +28,12 @@ jobs: appVersion=$(yq '.metabase.metabaseImage.tag' charts/nr-metabase/values.yaml) echo "app version is $appVersion" echo "app_version=$appVersion" >> "$GITHUB_OUTPUT" - if [ "$appVersion" != '' ]; then - echo "available=false" >> $GITHUB_OUTPUT; + if [ -z "$appVersion" ]; then + echo "Version is empty, marking as false" + echo "available=false" >> $GITHUB_OUTPUT else - echo "available=true" >> $GITHUB_OUTPUT; + echo "Version exists ($appVersion), marking as true" + echo "available=true" >> $GITHUB_OUTPUT fi - name: Get App Version run: echo "${{ steps.read_yaml.outputs.app_version }}" From 6fb11b0d1c876518065aa1b81c7caa9c4008f16b Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:18:20 -0800 Subject: [PATCH 4/6] fix: if conditions --- .github/workflows/on-pr-main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-pr-main.yml b/.github/workflows/on-pr-main.yml index b81db9a..62d6194 100644 --- a/.github/workflows/on-pr-main.yml +++ b/.github/workflows/on-pr-main.yml @@ -13,7 +13,7 @@ concurrency: jobs: extract_version: name: Extract Version - if: '!github.event.pull_request.head.repo.fork' + if: !github.event.pull_request.head.repo.fork runs-on: ubuntu-24.04 outputs: app_version: ${{ steps.read_yaml.outputs.app_version }} @@ -41,7 +41,7 @@ jobs: builds: name: Builds needs: extract_version - if: '!github.event.pull_request.head.repo.fork && needs.extract_version.outputs.available == true' + if: (!github.event.pull_request.head.repo.fork && needs.extract_version.outputs.available == true) runs-on: ubuntu-24.04 permissions: packages: write From 8d635e59952741408673cbca2d47285fad08f746 Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:19:03 -0800 Subject: [PATCH 5/6] fix: if conditional --- .github/workflows/on-pr-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-pr-main.yml b/.github/workflows/on-pr-main.yml index 62d6194..316a7ec 100644 --- a/.github/workflows/on-pr-main.yml +++ b/.github/workflows/on-pr-main.yml @@ -13,7 +13,7 @@ concurrency: jobs: extract_version: name: Extract Version - if: !github.event.pull_request.head.repo.fork + if: (!github.event.pull_request.head.repo.fork) runs-on: ubuntu-24.04 outputs: app_version: ${{ steps.read_yaml.outputs.app_version }} From 7438661eaf5bfcf1e78cd5520352feb4109bdae4 Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:20:53 -0800 Subject: [PATCH 6/6] fix: if condition --- .github/workflows/on-pr-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-pr-main.yml b/.github/workflows/on-pr-main.yml index 316a7ec..f7d6c29 100644 --- a/.github/workflows/on-pr-main.yml +++ b/.github/workflows/on-pr-main.yml @@ -41,7 +41,7 @@ jobs: builds: name: Builds needs: extract_version - if: (!github.event.pull_request.head.repo.fork && needs.extract_version.outputs.available == true) + if: (needs.extract_version.outputs.available == 'true') runs-on: ubuntu-24.04 permissions: packages: write