dummy commit

.github/workflows/helm-test-workflow.yaml

@@ -4,9 +4,11 @@ on:
   pull_request:
     branches:
       - main
+      - 'preview/*'
   push:
     branches:
       - main
+      - 'preview/*'
     tags:
       - '*'
   workflow_dispatch:
@@ -25,7 +27,7 @@ env:
   CHART_REPOSITORY_AUTH: "${{ secrets.CHARTS_PUBLIC_AUTH}}"
   CHARTS_PUBLIC_SNAPSHOTS_URL: "https://helm-charts.touk.pl/nexus/repository/helm-snapshots/"
   CHARTS_PUBLIC_RELEASES_URL: "https://helm-charts.touk.pl/nexus/repository/helm-releases/"
-
+  HELM_VERSION: 'version.BuildInfo{Version:"v3.13.0", GitCommit:"825e86f6a7a38cef1112bfa606e4127a706749b1", GitTreeState:"clean", GoVersion:"go1.20.8}"'
 defaults:
   run:
     shell: bash
@@ -37,6 +39,8 @@ jobs:
     outputs:
       version: ${{ steps.setVersion.outputs.version }}
     steps:
+      - name: Verify helm version
+        run: current_helm_version=$(helm version) && [ "$current_helm_version" = "$HELM_VERSION" ] && echo "Helm is in expected version" || echo "::warning title=Helm version is different than expected!::Helm has been updated on runner's image. It could lead to unexpected behaviour during pipeline execution!"
       - name: Checkout
         uses: actions/checkout@v2
       - name: Print Nussknacker version

src/Chart.lock

@@ -16,12 +16,12 @@ dependencies:
   version: 0.2.0
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 6.59.4
+  version: 6.60.6
 - name: influxdb
   repository: https://helm.influxdata.com/
   version: 4.12.5
 - name: telegraf
   repository: https://helm.influxdata.com/
-  version: 1.8.34
-digest: sha256:a4235f4aca5b0785f910bc33cb813604cab949729753b88fb095814524fe269c
-generated: "2023-09-13T10:29:02.122496096+02:00"
+  version: 1.8.35
+digest: sha256:8442dbfd35216a15e2929c58ebc8c159d76210b35c85faf6c24d4195a59eeb61
+generated: "2023-10-17T08:14:50.064086+02:00"

src/Chart.yaml

@@ -25,6 +25,7 @@ dependencies:
     version: ~11.0.3
     repository: "@bitnami"
     condition: zookeeper.enabled
+    alias: zookeeper_external
   - name: apicurio-registry
     repository: "@touk"
     version: ~0.1.5

src/values.yaml

@@ -2,6 +2,17 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+global:
+  kafka:
+    name: kafka
+    port: 9092
+  zookeeper: &zookeeper_ports_config
+    ports:
+      client: 2181
+  schemaRegistry:
+    name: apicurio-registry
+    path: /apis/ccompat/v6/
+
 replicaCount: 1
 
 image:
@@ -166,7 +177,10 @@ postgresql:
 
 zookeeper:
   enabled: true
-
+
+zookeeper_external:
+  service: *zookeeper_ports_config
+
 kafka:
   enabled: true
   persistence:
@@ -177,7 +191,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client }}"
+      - '{{ .Release.Name }}-zookeeper:{{ .Values.global.zookeeper.ports.client }}'
 
 apicurio-registry:
   enabled: true
@@ -267,14 +281,6 @@ telegraf:
     #We suppress default influxDB configuration from chart, as we cannot easily template influxdb url
     outputs: []
 
-global:
-  kafka:
-    name: kafka
-    port: 9092
-  schemaRegistry:
-    name: apicurio-registry
-    path: /apis/ccompat/v6/
-
 nussknackerInitContainers: [ ]
 
 #Extra resources to deploy