Skip to content

Commit 58de2b2

Browse files
author
Frederic Spiers
committed
Merge commit 'da69e0e' into fspiers/ENT-3334/incremental-sync-batch-1
2 parents b7d8732 + da69e0e commit 58de2b2

38 files changed

+440
-171
lines changed

.github/workflows/auto-label.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
steps:
2020
- name: Apply labels
21-
uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
21+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
2222
with:
2323
script: |
2424
let content = "";

.github/workflows/post-merge.yaml

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323
with:
2424
fetch-depth: 0
25-
token: ${{ secrets.GITHUB_TOKEN }}
25+
token: ${{ secrets.CHANGELOG_PAT || secrets.GITHUB_TOKEN }}
2626

2727
- name: Configure Git
2828
run: |
@@ -40,34 +40,28 @@ jobs:
4040
sudo wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
4141
sudo chmod +x /usr/local/bin/yq
4242
43-
- name: Setup Helm
44-
uses: Azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
45-
46-
# Python is required because `ct` uses Python-based tools
47-
- name: Set up Python
48-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
49-
with:
50-
python-version: 3.x
51-
52-
- name: Set up chart-testing-action
53-
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
54-
5543
- name: Get changed charts from last commit
5644
id: list-changed
5745
run: |
5846
# Get the commit SHA before the merge
5947
BEFORE_SHA="${{ github.event.before }}"
6048
61-
# Use chart-testing to find changed charts
62-
changed=$(ct list-changed --target-branch main --since "${BEFORE_SHA}")
63-
64-
if [[ -n "$changed" ]]; then
65-
echo "Changed charts:"
66-
echo "$changed"
67-
echo "changed=true" >> $GITHUB_OUTPUT
68-
echo 'changedCharts<<EOF' >> $GITHUB_OUTPUT
69-
echo $changed >> $GITHUB_OUTPUT
70-
echo 'EOF' >> $GITHUB_OUTPUT
49+
# Find changed charts directories using git diff
50+
changed_files=$(git diff --name-only "${BEFORE_SHA}" HEAD -- 'charts/**')
51+
52+
if [[ -n "$changed_files" ]]; then
53+
# Extract unique chart directories
54+
changed_charts=$(echo "$changed_files" | grep '^charts/' | cut -d/ -f1-2 | sort -u | tr '\n' ' ')
55+
56+
if [[ -n "$changed_charts" ]]; then
57+
echo "Changed charts:"
58+
echo "$changed_charts"
59+
echo "changed=true" >> $GITHUB_OUTPUT
60+
echo "changedCharts=${changed_charts}" >> $GITHUB_OUTPUT
61+
else
62+
echo "No chart changes detected"
63+
echo "changed=false" >> $GITHUB_OUTPUT
64+
fi
7165
else
7266
echo "No chart changes detected"
7367
echo "changed=false" >> $GITHUB_OUTPUT
@@ -76,7 +70,7 @@ jobs:
7670
- name: Get PR information
7771
id: pr-info
7872
if: steps.list-changed.outputs.changed == 'true'
79-
uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
73+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
8074
with:
8175
github-token: ${{ secrets.GITHUB_TOKEN }}
8276
script: |
@@ -158,4 +152,9 @@ jobs:
158152
git add charts/*/CHANGELOG.md
159153
git commit -m "chore: update CHANGELOG.md for merged changes" \
160154
-m "Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
155+
156+
# Pull latest changes and rebase our commit on top
157+
git pull --rebase origin main
158+
159+
# Push the changes
161160
git push origin main

.github/workflows/pull-request.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,19 @@ jobs:
3232
repository: ${{github.event.pull_request.head.repo.full_name}}
3333
fetch-depth: 0
3434

35+
- name: Fetch upstream main branch
36+
run: |
37+
# Fetch the base repository's target branch and update origin/main to point to it
38+
git remote set-url origin https://github.com/CloudPirates-io/helm-charts.git
39+
git fetch origin ${{ github.event.repository.default_branch }}
40+
# Re-add the fork as a remote and checkout the PR branch
41+
git remote add fork https://github.com/${{ github.event.pull_request.head.repo.full_name }}.git || true
42+
git fetch fork ${{ github.head_ref }}
43+
3544
# Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
3645
# yamllint (https://github.com/adrienverge/yamllint) which require Python
3746
- name: Set up Python
38-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
47+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
3948
with:
4049
python-version: 3.x
4150

@@ -145,4 +154,3 @@ jobs:
145154
# and without cleanup (let GitHub Actions handle it)
146155
./test-charts.sh "$CHART_NAME" --no-cleanup
147156
done
148-

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
5454

5555
- name: Install cosign
56-
uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
56+
uses: sigstore/cosign-installer@v3.10.0
5757
if: ${{ steps.chart-releaser.outputs.changed_charts }}
5858

5959
- id: github-repo-owner-name

charts/clusterpirate/CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
# Changelog
22

3+
4+
## 1.1.3 (2025-10-13)
5+
6+
* Fix clusterpirate (#372) ([e659f51](https://github.com/CloudPirates-io/helm-charts/commit/e659f51))
7+
8+
## 1.1.2 (2025-10-13)
9+
10+
* Fix formatting (#371) ([cf4670a](https://github.com/CloudPirates-io/helm-charts/commit/cf4670a))
11+
* Bugfix/lint workflow (#365) ([adeac21](https://github.com/CloudPirates-io/helm-charts/commit/adeac21))
12+
13+
## 1.1.1 (2025-10-13)
14+
15+
* Bugfix/lint workflow (#363) ([ce5c550](https://github.com/CloudPirates-io/helm-charts/commit/ce5c550))
16+
* Bugfix/lint workflow (#362) ([bbf7bd5](https://github.com/CloudPirates-io/helm-charts/commit/bbf7bd5))
17+
318
## 1.1.0 (2025-10-13)
419

5-
* [clusterpirate] Bump dependencies ([#357](https://github.com/CloudPirates-io/helm-charts/pull/357))
20+
* Bump dependencies (#357) ([c2909cd](https://github.com/CloudPirates-io/helm-charts/commit/c2909cd))
621

722
## 1.0.7 (2025-08-27)
823

charts/clusterpirate/Chart.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@ apiVersion: v2
22
name: clusterpirate
33
description: Client agent for the CloudPirates Managed Observability Platform to connect your Kubernetes cluster to our infrastructure
44
type: application
5-
version: 1.1.1
5+
version: 1.1.4
66
appVersion: "1.0.1"
7-
87
keywords:
98
- kubernetes
109
- clusterpirate
1110
- cloudpirates
1211
- observability
1312
- agent
14-
1513
home: https://www.cloudpirates.io
16-
1714
maintainers:
1815
- name: CloudPirates GmbH & Co. KG
1916
url: https://www.cloudpirates.io
20-
2117
dependencies:
2218
- name: common
2319
version: "1.x.x"
@@ -26,5 +22,4 @@ dependencies:
2622
version: "0.5.0"
2723
repository: oci://registry-1.docker.io/cloudpirates
2824
condition: valkey.enabled
29-
3025
icon: https://a.storyblok.com/f/143071/512x512/88dc07809a/cluster-pirate-logo.svg

charts/clusterpirate/values.schema.json

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,10 @@
2222
},
2323
"imagePullSecrets": {
2424
"type": "array",
25-
"title": "Image Pull Secrets",
26-
"description": "Registry secret names as an array of objects",
2725
"items": {
28-
"type": "object",
26+
"type": ["string", "object"],
2927
"properties": {
30-
"name": {
31-
"type": "string",
32-
"title": "Secret Name",
33-
"description": "Name of the image pull secret"
34-
}
28+
"name": { "type": "string" }
3529
},
3630
"required": ["name"]
3731
}
@@ -60,11 +54,7 @@
6054
"type": "string",
6155
"title": "Image Pull Policy",
6256
"description": "ClusterPirate image pull policy",
63-
"enum": [
64-
"Always",
65-
"Never",
66-
"IfNotPresent"
67-
]
57+
"enum": ["Always", "Never", "IfNotPresent"]
6858
}
6959
}
7060
},
@@ -151,9 +141,7 @@
151141
"description": "Source for the environment variable value"
152142
}
153143
},
154-
"required": [
155-
"name"
156-
]
144+
"required": ["name"]
157145
}
158146
},
159147
"probes": {
@@ -258,13 +246,7 @@
258246
"type": "string",
259247
"title": "Log Level",
260248
"description": "Application logging level",
261-
"enum": [
262-
"debug",
263-
"info",
264-
"warn",
265-
"error",
266-
"fatal"
267-
]
249+
"enum": ["debug", "info", "warn", "error", "fatal"]
268250
},
269251
"healthPort": {
270252
"type": "integer",
@@ -419,7 +401,7 @@
419401
"type": "object",
420402
"title": "Valkey persistence settings",
421403
"properties": {
422-
"enabled": {
404+
"enabled": {
423405
"type": "boolean",
424406
"title": "Enable persistence"
425407
}
@@ -455,4 +437,4 @@
455437
}
456438
}
457439
}
458-
}
440+
}

charts/etcd/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22

33

4+
## 0.1.2 (2025-10-13)
5+
6+
* update helm-chart icon (#360) ([6544ddf](https://github.com/CloudPirates-io/helm-charts/commit/6544ddf))
7+
48
## 0.1.1 (2025-10-10)
59

610
* artifact hub repository id (#333) ([36ca7c7](https://github.com/CloudPirates-io/helm-charts/commit/36ca7c7))

charts/etcd/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: etcd
33
description: etcd is a distributed reliable key-value store for the most critical data of a distributed system
44
type: application
5-
version: 0.1.2
5+
version: 0.1.3
66
appVersion: "3.6.0"
77
keywords:
88
- etcd

charts/etcd/values.schema.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@
1616
},
1717
"imagePullSecrets": {
1818
"type": "array",
19-
"title": "Global Image Pull Secrets",
20-
"description": "Global Docker registry secret names as an array",
2119
"items": {
22-
"type": "object",
20+
"type": ["string", "object"],
2321
"properties": {
24-
"name": {
25-
"type": "string"
26-
}
22+
"name": { "type": "string" }
2723
},
2824
"required": ["name"]
2925
}

0 commit comments

Comments
 (0)