Merge commit '64bc0ac' into fspiers/ENT-3334/incremental-sync-batch-2

Author: Frederic Spiers

.github/workflows/generate-schema-gitguardian.yaml

@@ -1,4 +1,4 @@
-name: "Generate values.schema.json GitGuardian"
+name: "Generate values.schema.json"
 
 on:
   push:
@@ -29,6 +29,8 @@ jobs:
   generate-schema:
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    # Skip if the commit was made by github-actions bot to prevent infinite loops
+    if: github.actor != 'github-actions[bot]'
     permissions:
       contents: write
       pull-requests: write
@@ -45,7 +47,7 @@ jobs:
           python-version: '3.11'
 
       - name: Set up Helm
-        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
+        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
         with:
           version: 'v3.19.2'
 
@@ -214,27 +216,48 @@ jobs:
           echo "  has_changes: ${{ steps.check-changes.outputs.has_changes }}"
           echo "  Should commit to main: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' && steps.check-changes.outputs.has_changes == 'true' }}"
 
-      - name: Commit and push schema updates (push to main)
+      - name: Create PR for schema updates (push to main)
         if: |
           (github.event_name == 'push' || github.event_name == 'workflow_dispatch') &&
           github.ref == 'refs/heads/main' &&
           steps.check-changes.outputs.has_changes == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
 
+          # Create a new branch for the schema updates
+          BRANCH_NAME="auto/schema-update-$(date +%s)"
+          git checkout -b "$BRANCH_NAME"
+
           git add charts/*/values.schema.json
 
           git commit -m "chore: auto-generate values.schema.json for updated charts" \
             -m "Automatically generated JSON schemas for Helm values files." \
             -m "" \
             -m "Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
 
-          # Pull latest changes and rebase
-          git pull --rebase origin main
+          # Push the branch
+          git push origin "$BRANCH_NAME"
+
+          # Create a pull request
+          gh pr create \
+            --title "chore: auto-generate values.schema.json" \
+            --body "This PR contains automatically generated JSON schemas for Helm values files.
+
+          ## Changes
+          - Auto-generated \`values.schema.json\` files for charts with updated \`values.yaml\`
+
+          ## Notes
+          - This PR was automatically created by the schema generation workflow
+          - Please review and merge if the changes look correct
+          - The workflow will not run again on this bot's commits to prevent loops
 
-          # Push changes
-          git push origin main
+          ---
+          🤖 Generated by [generate-schema workflow](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" \
+            --base main \
+            --head "$BRANCH_NAME"
 
       - name: Commit schema updates to PR branch
         if: |

.github/workflows/generate-schema.yaml

@@ -29,6 +29,8 @@ jobs:
   generate-schema:
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    # Skip if the commit was made by github-actions bot to prevent infinite loops
+    if: github.actor != 'github-actions[bot]'
     permissions:
       contents: write
       pull-requests: write
@@ -37,7 +39,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.CHANGELOG_PAT }}
 
       - name: Set up Python
         uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
@@ -214,27 +216,48 @@ jobs:
           echo "  has_changes: ${{ steps.check-changes.outputs.has_changes }}"
           echo "  Should commit to main: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' && steps.check-changes.outputs.has_changes == 'true' }}"
 
-      - name: Commit and push schema updates (push to main)
+      - name: Create PR for schema updates (push to main)
         if: |
           (github.event_name == 'push' || github.event_name == 'workflow_dispatch') &&
           github.ref == 'refs/heads/main' &&
           steps.check-changes.outputs.has_changes == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.CHANGELOG_PAT }}
         run: |
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
 
+          # Create a new branch for the schema updates
+          BRANCH_NAME="auto/schema-update-$(date +%s)"
+          git checkout -b "$BRANCH_NAME"
+
           git add charts/*/values.schema.json
 
           git commit -m "chore: auto-generate values.schema.json for updated charts" \
             -m "Automatically generated JSON schemas for Helm values files." \
             -m "" \
             -m "Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
 
-          # Pull latest changes and rebase
-          git pull --rebase origin main
+          # Push the branch
+          git push origin "$BRANCH_NAME"
+
+          # Create a pull request
+          gh pr create \
+            --title "chore: auto-generate values.schema.json" \
+            --body "This PR contains automatically generated JSON schemas for Helm values files.
+
+          ## Changes
+          - Auto-generated \`values.schema.json\` files for charts with updated \`values.yaml\`
+
+          ## Notes
+          - This PR was automatically created by the schema generation workflow
+          - Please review and merge if the changes look correct
+          - The workflow will not run again on this bot's commits to prevent loops
 
-          # Push changes
-          git push origin main
+          ---
+          🤖 Generated by [generate-schema workflow](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" \
+            --base main \
+            --head "$BRANCH_NAME"
 
       - name: Commit schema updates to PR branch
         if: |

.github/workflows/release.yaml

@@ -12,6 +12,10 @@ on:
         type: boolean
         default: false
 
+concurrency:
+  group: release
+  cancel-in-progress: true
+
 jobs:
   release:
     permissions:

charts/clusterpirate/Chart.lock

@@ -0,0 +1,9 @@
+dependencies:
+- name: common
+  repository: oci://registry-1.docker.io/cloudpirates
+  version: 2.0.0
+- name: valkey
+  repository: oci://registry-1.docker.io/cloudpirates
+  version: 0.7.0
+digest: sha256:0429787cff01e5cb9381e674cadd6338ba4f44a9df0069191c5cd8c2088324da
+generated: "2025-10-26T20:38:30.610019199Z"

charts/clusterpirate/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clusterpirate
 description: Client agent for the CloudPirates Managed Observability Platform to connect your Kubernetes cluster to our infrastructure
 type: application
-version: 1.2.2
+version: 1.2.5
 appVersion: "1.0.1"
 keywords:
   - kubernetes
@@ -22,7 +22,7 @@ dependencies:
     version: "2.x.x"
     repository: oci://registry-1.docker.io/cloudpirates
   - name: valkey
-    version: "0.6.1"
+    version: "0.7.0"
     repository: oci://registry-1.docker.io/cloudpirates
     condition: valkey.enabled
 icon: https://a.storyblok.com/f/143071/512x512/88dc07809a/cluster-pirate-logo.svg

charts/etcd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: etcd
 description: etcd is a distributed reliable key-value store for the most critical data of a distributed system
 type: application
-version: 0.2.2
+version: 0.2.3
 appVersion: "3.6.5"
 keywords:
   - etcd

charts/etcd/templates/networkpolicy.yaml

@@ -6,6 +6,10 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "etcd.labels" . | nindent 4 }}
+  {{- with (include "etcd.annotations" .) }}
+  annotations: 
+{{- . | indent 4 }}
+  {{- end }}
 spec:
   podSelector:
     matchLabels:

charts/etcd/templates/poddisruptionbudget.yaml

@@ -6,6 +6,10 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "etcd.labels" . | nindent 4 }}
+  {{- with (include "etcd.annotations" .) }}
+  annotations: 
+{{- . | indent 4 }}
+  {{- end }}
 spec:
   {{- if .Values.podDisruptionBudget.minAvailable }}
   minAvailable: {{ .Values.podDisruptionBudget.minAvailable | quote }}

charts/etcd/templates/service.yaml

@@ -5,9 +5,12 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "etcd.labels" . | nindent 4 }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
+  {{- if or (include "etcd.annotations" .) .Values.service.annotations }}
+  annotations: 
+{{- (include "etcd.annotations" .) | indent 4 }}
+{{- if .Values.service.annotations }}
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
   {{- end }}
 spec:
   type: {{ .Values.service.type }}

charts/etcd/templates/serviceaccount.yaml

@@ -6,9 +6,12 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "etcd.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
+  {{- if or (include "etcd.annotations" .) .Values.serviceAccount.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+{{- (include "etcd.annotations" .) | indent 4 }}
+{{- if .Values.serviceAccount.annotations }}
+{{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
+{{- end }}
   {{- end }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 {{- end }}