diff --git a/.github/workflows/on-pr-main.yml b/.github/workflows/on-pr-main.yml index d846988..f7d6c29 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 }} @@ -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 }}" @@ -39,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 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 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: