Merge branch 'master' of https://github.com/logzio/logzio-agent-manifest

logzio · Jul 22, 2024 · cc1b84e · cc1b84e
2 parents 98bfdbe + 3f8162e
commit cc1b84e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -17,11 +17,17 @@ jobs:
   update_version:
     name: Update Version
     runs-on: macos-latest
+    permissions:
+      contents: write  # Allows pushing changes to the repository
+      issues: write    # Allows creating issues
+      packages: write  # Allows accessing and publishing packages
+      pull-requests: write  # Allows creating and managing pull requests
+      actions: write  # Allows updating GitHub Action workflows
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          token: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Increase Version
         run: |
           version=$(cat ./version | grep -o -e '[0-9]\{1,2\}\.[0-9]\{1,2\}\.[0-9]\{1,2\}')
@@ -69,7 +75,7 @@ jobs:
       actions: write  # Allows updating GitHub Action workflows    
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Update version file
         run: |
           echo "${{ needs.update_version.outputs.VERSION }}" >./version

diff --git a/config-templates/helm.json b/config-templates/helm.json
@@ -27,7 +27,7 @@
     "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS' || @.type=='TRACING')]",
     "conditionalTemplates": [
       {
-        "condition": "(@['telemetries'][?(@['type']=='TRACING')].length > 0) || (@['telemetries'][?(@['type']=='METRICS')].params[?(@['name']=='isObjectLogs')].value == true)",
+        "condition": "(datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')]) || (datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='TRACING')] && datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value)",
         "template": "  --set logzio-k8s-telemetry.secrets.LogzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
       }
     ]