pull main

Author: KryukovaPolina

.github/assets-config.yml

@@ -0,0 +1,23 @@
+---
+conventional-commits:
+  - type: 'fix'
+    nouns: ['FIX', 'Fix', 'fix', 'FIXED', 'Fixed', 'fixed']
+    labels: ['bug']
+  - type: 'feature'
+    nouns: ['FEATURE', 'Feature', 'feature', 'FEAT', 'Feat', 'feat']
+    labels: ['enhancement']
+  - type: 'breaking_change'
+    nouns: ['BREAKING CHANGE', 'BREAKING', 'MAJOR']
+    labels: ['breaking-change']
+  - type: 'refactor'
+    nouns: ['refactor', 'Refactor']
+    labels: ['refactor']
+  - type: 'documentation'
+    nouns: ['docs', 'doc', 'document', 'documentation']
+    labels: ['documentation']
+  - type: 'build'
+    nouns: ['build', 'rebuild']
+    labels: ['build']
+  - type: 'config'
+    nouns: ['config', 'conf', 'configuration', 'configure']
+    labels: ['config']

.github/auto-labeler-config.yaml

@@ -13,7 +13,7 @@
     {
       "name": "qubership-zookeeper-transfer",
       "file": "docker-transfer/Dockerfile",
-      "context": ""
+      "context": "."
     },
     {
       "name": "qubership-zookeeper-backup-daemon",

.github/helm-charts-release-config.yaml .github/charts-values-update-config.yaml.github/helm-charts-release-config.yaml renamed to .github/charts-values-update-config.yaml

@@ -29,7 +29,6 @@ jobs:
           check-tag: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   load-docker-build-components:
     runs-on: ubuntu-latest
     outputs:
@@ -99,28 +98,18 @@ jobs:
           fetch-depth: 0
       - name: "Update versions in values"
         id: update-versions
-        uses: netcracker/qubership-workflow-hub/actions/helm-charts-release@main
+        uses: netcracker/qubership-workflow-hub/actions/charts-values-update-action@main
         with:
           release-version: ${{ inputs.release }}
-          config-file: .github/helm-charts-release-config.yaml
+          config-file: .github/charts-values-update-config.yaml
         env:
           ${{ insert }}: ${{ vars }}
       - name: "Debug"
         run: |
           echo "Images versions: ${{ steps.update-versions.outputs.images-versions }}"
-  tag:
-    needs: [chart-release-prepare]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create release tag
-        uses: netcracker/qubership-workflow-hub/actions/tag-action@main
-        with:
-          tag-name: "${{ inputs.release }}"
-          ref: "release-${{ inputs.release }}"
-          create-tag: true
-          check-tag: false
+
   docker-build:
-    needs: [tag, chart-release-prepare, load-docker-build-components]
+    needs: [chart-release-prepare, load-docker-build-components]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -135,18 +124,17 @@ jobs:
       - name: Docker build
         uses: netcracker/qubership-workflow-hub/actions/docker-action@main
         with:
-          ref: ${{ inputs.release }}
+          ref: release-${{ inputs.release }}
           download-artifact: false
           dry-run: false
           component: ${{ toJson(matrix.component) }}
           platforms: ${{ needs.load-docker-build-components.outputs.platforms }}
           tags: "${{ env.IMAGE_VERSION }},latest"
         env:
           GITHUB_TOKEN: ${{ github.token }}
-
   charts-release:
-    needs: [tag, docker-build]
-    continue-on-error: true
+    needs: [docker-build]
+    continue-on-error: false
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -161,10 +149,13 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Run chart-releaser
+        #continue-on-error: true
         uses: netcracker/chart-releaser-action@main
         with:
           charts_dir: operator/charts/helm
           release_name_template: "{{ .Version }}"
+          skip_existing: true
+          skip_upload: true
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
@@ -178,21 +169,10 @@ jobs:
           version: ${{ inputs.release }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  upload-assets:
-    needs: [charts-release]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Upload Assets
+        uses: netcracker/qubership-workflow-hub/actions/assets-action@main
         with:
-          ref: ${{ inputs.release }}
-
-      - name: Archive and Upload Assets
-        uses: netcracker/qubership-workflow-hub/actions/archive-and-upload-assets@main
-        with:
-          config-path: './.github/assets-config.yml'
-          dist-path: './dist'
-          upload: true
-          ref: ${{ inputs.release }}
+          tag: ${{ inputs.release }}
+          item-path: .cr-release-packages/*.tgz
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/docker-build-config.json

@@ -894,13 +894,68 @@ availability zones.
 You can manage pods' distribution using `affinity` rules to prevent Kubernetes from running ZooKeeper pods on nodes of
 the same availability zone.
 
+#### Affinity cross Kubernetes Nodes
+
+Default affinity cross kubernetes Nodes (1 pod per 1 node). 
+
+<details>
+<summary>Click to expand YAML</summary>
+
+```yaml
+zooKeeper:
+  affinity: {
+    "podAntiAffinity": {
+      "requiredDuringSchedulingIgnoredDuringExecution": [
+        {
+          "labelSelector": {
+            "matchExpressions": [
+              {
+                "key": "component",
+                "operator": "In",
+                "values": [
+                  "zookeeper"
+                ]
+              }
+            ]
+          },
+          "topologyKey": "kubernetes.io/hostname"
+        }
+      ]
+    },
+    "nodeAffinity": {
+      "requiredDuringSchedulingIgnoredDuringExecution": {
+        "nodeSelectorTerms": [
+          {
+            "matchExpressions": [
+              {
+                "key": "role",
+                "operator": "In",
+                "values": [
+                  "compute"
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+```
+
+</details>
+
+Where:
+
+* `kubernetes.io/hostname` is the name of the label that defines the node name. This is the default name for Kubernetes.
+* `role` and `compute` are the sample name and value of label that defines the region to run ZooKeeper pods.
+
 **Note**: This section describes deployment only for `storage class` Persistent Volumes (PV) type because with
 Predefined PV, the ZooKeeper pods are started on the nodes that are specified explicitly with Persistent Volumes. In
 that way, it is necessary to take care of creating PVs on nodes belonging to different AZ in advance.
 
 #### Replicas Fewer Than Availability Zones
 
-For cases when the number of ZooKeeper pods (value of the `zookeeper.replicas` parameter) is equal or less than the number of
+For cases when the number of ZooKeeper pods (value of the `zooKeeper.replicas` parameter) is equal or less than the number of
 availability zones, you need to restrict the start of pods to one pod per availability zone.
 You can also specify additional node affinity rule to start pods on allowed Kubernetes nodes.
 
@@ -910,7 +965,7 @@ For this, you can use the following affinity rules:
 <summary>Click to expand YAML</summary>
 
 ```yaml
-zookeeper:
+zooKeeper:
   affinity: {
     "podAntiAffinity": {
       "requiredDuringSchedulingIgnoredDuringExecution": [
@@ -960,7 +1015,7 @@ Where:
 
 #### Replicas More Than Availability Zones
 
-For cases when the number of ZooKeeper pods (value of the `zookeeper.replicas` parameter) is greater than the number of availability
+For cases when the number of ZooKeeper pods (value of the `zooKeeper.replicas` parameter) is greater than the number of availability
 zones, you need to restrict the start of pods to one pod per node and specify the preferred rule to start on different
 availability zones.
 You can also specify an additional node affinity rule to start the pods on allowed Kubernetes nodes.
@@ -971,7 +1026,7 @@ For this, you can use the following affinity rules:
 <summary>Click to expand YAML</summary>
 
 ```yaml
-zookeeper:
+zooKeeper:
   affinity: {
     "podAntiAffinity": {
       "requiredDuringSchedulingIgnoredDuringExecution": [

.github/workflows/helm-charts-release.yaml

@@ -1,4 +1,4 @@
-FROM telegraf:1.35.1-alpine
+FROM telegraf:1.35.2-alpine
 
 ENV ZOOKEEPER_MONITORING_HOME=/opt/zookeeper-monitoring
 
@@ -16,7 +16,7 @@ RUN rm /usr/lib/python3.12/EXTERNALLY-MANAGED
 
 RUN  python3 -m ensurepip \
     && rm -r /usr/lib/python*/ensurepip \
-    && pip3 install --upgrade pip setuptools==70.0.0 \
+    && pip3 install --upgrade pip setuptools==80.9.0 \
     && pip3 install -r ${ZOOKEEPER_MONITORING_HOME}/requirements.txt \
     && chmod -R 777 ${ZOOKEEPER_MONITORING_HOME}/exec-scripts \
     && chmod +x /docker-entrypoint.sh \