Skip to content

Commit a46dd9e

Browse files
committed
fix: Updating GH concurrency error and updating helm chart
Signed-off-by: S3B4SZ17 <sebastian.zumbado@sysdig.com>
1 parent ca74936 commit a46dd9e

File tree

5 files changed

+26
-20
lines changed

5 files changed

+26
-20
lines changed

.github/workflows/helm_test.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,20 @@ on:
55
pull_request:
66
branches:
77
- main
8-
- develop
9-
- feature/**
10-
- release/**
11-
- hotfix/**
8+
- beta
129
paths:
1310
- 'charts/**'
1411
push:
1512
branches:
1613
- main
17-
- develop
18-
- feature/**
19-
- release/**
20-
- hotfix/**
14+
- beta
2115
paths:
2216
- 'charts/**'
17+
workflow_call:
18+
workflow_dispatch:
2319

2420
concurrency:
25-
group: '${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
21+
group: 'helm-test-${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
2622
cancel-in-progress: true
2723

2824
jobs:

.github/workflows/publish.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
workflow_dispatch:
1717

1818
concurrency:
19-
group: '${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
19+
group: 'publish-${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
2020
cancel-in-progress: true
2121

2222
jobs:
@@ -100,10 +100,19 @@ jobs:
100100
TAG_CONTEXT: 'repo'
101101
WITH_V: true
102102
PRERELEASE_SUFFIX: "beta"
103-
PRERELEASE: ${{ (github.base_ref != 'main') && 'true' || 'false' }}
103+
PRERELEASE: ${{ (github.base_ref == 'beta') && 'true' || (github.base_ref == 'main') && 'false' || (github.base_ref == 'integration') && 'false' || 'true' }}
104104

105105
- name: Summary
106106
run: |
107107
echo "## Release Summary
108108
- Tag: ${{ steps.semantic_release.outputs.tag }}
109109
- Docker Image: ghcr.io/sysdiglabs/sysdig-mcp-server:v${{ needs.push_to_registry.outputs.version }}" >> $GITHUB_STEP_SUMMARY
110+
111+
test_helm_chart:
112+
name: Test Helm Chart
113+
needs: push_to_registry
114+
permissions:
115+
contents: read # required for actions/checkout
116+
pull-requests: write # required for creating a PR with the chart changes
117+
uses: ./.github/workflows/helm_test.yaml
118+
secrets: inherit

.github/workflows/test.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
push:
66
branches:
77
- main
8-
- develop
8+
- beta
9+
- integration
910
- feature/**
1011
- release/**
1112
- hotfix/**
@@ -25,9 +26,10 @@ on:
2526
- tools/**
2627
- utils/**
2728
workflow_call:
29+
workflow_dispatch:
2830

2931
concurrency:
30-
group: '${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
32+
group: 'tests-${{ github.workflow }}-${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
3133
cancel-in-progress: true
3234

3335
jobs:
@@ -59,8 +61,8 @@ jobs:
5961
- name: Run Unit Tests
6062
run: make test
6163

62-
pre_release:
63-
name: Tag Release
64+
check_version:
65+
name: Check Version
6466
runs-on: ubuntu-latest
6567
needs: test
6668
permissions:
@@ -87,7 +89,7 @@ jobs:
8789
TAG_CONTEXT: 'repo'
8890
WITH_V: true
8991
PRERELEASE_SUFFIX: "beta"
90-
PRERELEASE: ${{ (github.base_ref != 'main') && 'true' || 'false' }}
92+
PRERELEASE: ${{ (github.base_ref == 'beta') && 'true' || (github.base_ref == 'main') && 'false' || (github.base_ref == 'integration') && 'false' || 'true' }}
9193
DRY_RUN: true
9294

9395
- name: Compare versions

charts/sysdig-mcp/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ type: application
2020
# This is the chart version. This version number should be incremented each time you make changes
2121
# to the chart and its templates, including the app version.
2222
# Versions are expected to follow Semantic Versioning (https://semver.org/)
23-
version: 0.1.1
23+
version: 0.1.2
2424

2525
# This is the version number of the application being deployed. This version number should be
2626
# incremented each time you make changes to the application. Versions are not expected to
2727
# follow Semantic Versioning. They should reflect the version the application is using.
2828
# It is recommended to use it with quotes.
29-
appVersion: "0.1.1"
29+
appVersion: "v0.1.2"

charts/sysdig-mcp/values.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ image:
88
repository: ghcr.io/sysdiglabs/sysdig-mcp-server
99
pullPolicy: IfNotPresent
1010
# Overrides the image tag whose default is the chart appVersion.
11-
tag: "v0.1.1-e789d6e"
11+
tag: "v0.1.2-beta.0-3d30346"
1212

1313
imagePullSecrets: []
1414
nameOverride: ""
@@ -51,7 +51,6 @@ securityContext:
5151
runAsNonRoot: true
5252
runAsUser: 1001
5353
runAsGroup: 1001
54-
fsGroup: 1001
5554

5655
service:
5756
type: ClusterIP

0 commit comments

Comments
 (0)