Skip to content

Commit de40903

Browse files
jCOTINEAUjCOTINEAU
committed
SONAR-25652-update-mise-install
1 parent ef754f3 commit de40903

File tree

4 files changed

+100
-44
lines changed

4 files changed

+100
-44
lines changed

‎.github/workflows/build.yml

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,16 @@ jobs:
2424
- uses: jdx/mise-action@bfb9fa0b029db830a8c570757cee683df207a6c5 # v2.4.0
2525
with:
2626
version: 2025.7.12
27+
- name: Set up chart-testing
28+
uses: helm/[email protected]
29+
- uses: actions/[email protected]
30+
with:
31+
python-version: '3.x'
32+
check-latest: true
2733
- name: Install additional tools
2834
run: |
2935
# Install yamllint and yamale
3036
pip install yamllint==1.37.1 yamale==6.0.0
31-
# Install chart-testing
32-
curl -LO https://github.com/helm/chart-testing/releases/download/v3.13.0/chart-testing_3.13.0_linux_amd64.tar.gz
33-
echo "fcbae93a01887730054b5b0b4536b8cfbfe6010fdffccf66b8b87f5f764287d9 chart-testing_3.13.0_linux_amd64.tar.gz" | sha256sum -c
34-
tar -xf chart-testing_3.13.0_linux_amd64.tar.gz
35-
sudo mv ct /usr/local/bin/ct
36-
sudo mkdir -p /etc/ct
37-
sudo mv etc/chart_schema.yaml /etc/ct/chart_schema.yaml
38-
sudo mv etc/lintconf.yaml /etc/ct/lintconf.yaml
3937
- name: Build chart dependencies
4038
run: |
4139
./.cirrus/build_chart_dependencies.sh charts/sonarqube
@@ -151,8 +149,10 @@ jobs:
151149
run: |
152150
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.18.9/openshift-client-linux.tar.gz
153151
echo "1e2d73c870756e3940dcb6c1112c7aa7f702a89cfdb992d11079ac852b4ea05c openshift-client-linux.tar.gz" | sha256sum -c
154-
tar -xf openshift-client-linux.tar.gz
155-
sudo mv oc /usr/local/bin/oc
152+
mkdir -p /tmp/openshift
153+
tar -xf openshift-client-linux.tar.gz -C /tmp/openshift
154+
sudo mv /tmp/openshift/oc /usr/local/bin/oc
155+
rm -rf /tmp/openshift openshift-client-linux.tar.gz
156156
- name: Authenticate to OpenShift
157157
env:
158158
ROSA_OPENSHIFT_URL: ${{ fromJSON(steps.secrets.outputs.vault).ROSA_OPENSHIFT_URL }}
@@ -222,8 +222,10 @@ jobs:
222222
run: |
223223
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.18.9/openshift-client-linux.tar.gz
224224
echo "1e2d73c870756e3940dcb6c1112c7aa7f702a89cfdb992d11079ac852b4ea05c openshift-client-linux.tar.gz" | sha256sum -c
225-
tar -xf openshift-client-linux.tar.gz
226-
sudo mv oc /usr/local/bin/oc
225+
mkdir -p /tmp/openshift
226+
tar -xf openshift-client-linux.tar.gz -C /tmp/openshift
227+
sudo mv /tmp/openshift/oc /usr/local/bin/oc
228+
rm -rf /tmp/openshift openshift-client-linux.tar.gz
227229
- name: Authenticate to OpenShift
228230
env:
229231
ROSA_OPENSHIFT_URL: ${{ fromJSON(steps.secrets.outputs.vault).ROSA_OPENSHIFT_URL }}
@@ -272,27 +274,22 @@ jobs:
272274
- uses: jdx/mise-action@bfb9fa0b029db830a8c570757cee683df207a6c5 # v2.4.0
273275
with:
274276
version: 2025.7.12
275-
- name: Install chart-testing
276-
run: |
277-
curl -LO https://github.com/helm/chart-testing/releases/download/v3.13.0/chart-testing_3.13.0_linux_amd64.tar.gz
278-
echo "fcbae93a01887730054b5b0b4536b8cfbfe6010fdffccf66b8b87f5f764287d9 chart-testing_3.13.0_linux_amd64.tar.gz" | sha256sum -c
279-
tar -xf chart-testing_3.13.0_linux_amd64.tar.gz
280-
sudo mv ct /usr/local/bin/ct
281-
sudo mkdir -p /etc/ct
282-
sudo mv etc/chart_schema.yaml /etc/ct/chart_schema.yaml
283-
sudo mv etc/lintconf.yaml /etc/ct/lintconf.yaml
277+
- name: Set up chart-testing
278+
uses: helm/[email protected]
279+
- name: Create kind cluster
280+
uses: helm/[email protected]
284281
- name: Setup Kind cluster
285282
run: |
286-
./.cirrus/setup_kind_vm.sh
287-
kind create cluster
288-
kubectl cluster-info --context kind-kind
283+
# ./.cirrus/setup_kind_vm.sh
284+
kubectl cluster-info --context kind-chart-testing
289285
kubectl get nodes
286+
kubectl describe node chart-testing-control-plane
290287
- name: Setup Istio
291288
run: |
292289
helm repo add istio https://istio-release.storage.googleapis.com/charts
293290
kubectl create namespace istio-system --dry-run=client -o yaml | kubectl apply -f -
294291
helm upgrade -i istio-base istio/base -n istio-system --set defaultRevision=default --set global.proxy.holdApplicationUntilProxyStarts=true --wait
295-
helm upgrade -i istiod istio/istiod --set global.proxy.holdApplicationUntilProxyStarts=true -n istio-system --wait
292+
helm upgrade -i istiod istio/istiod --set global.proxy.holdApplicationUntilProxyStarts=true --set resources.requests.cpu=100m -n istio-system --wait
296293
kubectl create namespace test --dry-run=client -o yaml | kubectl apply -f -
297294
kubectl label namespace test istio-injection=enabled
298295
- id: secrets
@@ -306,6 +303,14 @@ jobs:
306303
DOCKER_USERNAME: ${{ fromJSON(steps.secrets.outputs.vault).DOCKER_USERNAME }}
307304
DOCKER_PASSWORD: ${{ fromJSON(steps.secrets.outputs.vault).DOCKER_PASSWORD }}
308305
run: kubectl create secret docker-registry pullsecret --namespace test --docker-username=${DOCKER_USERNAME} --docker-password=${DOCKER_PASSWORD} --dry-run=client -o yaml | kubectl apply -f -
306+
- name: Install ArtifactHub CLI
307+
run: |
308+
curl -LO https://github.com/artifacthub/hub/releases/download/v1.21.0/ah_1.21.0_linux_amd64.tar.gz
309+
echo "48d6b87b60baf4ee8fd5efbfec3bf5fb3ca783ab3f1dab625e64332b95df2a84 ah_1.21.0_linux_amd64.tar.gz" | sha256sum -c
310+
mkdir -p /tmp/artifacthub
311+
tar -xf ah_1.21.0_linux_amd64.tar.gz -C /tmp/artifacthub
312+
sudo mv /tmp/artifacthub/ah /usr/local/bin/ah
313+
rm -rf /tmp/artifacthub ah_1.21.0_linux_amd64.tar.gz
309314
- name: Run ArtifactHub lint
310315
run: ah lint
311316
- name: Run chart testing
@@ -330,40 +335,43 @@ jobs:
330335
- uses: jdx/mise-action@bfb9fa0b029db830a8c570757cee683df207a6c5 # v2.4.0
331336
with:
332337
version: 2025.7.12
333-
- name: Install chart-testing
334-
run: |
335-
curl -LO https://github.com/helm/chart-testing/releases/download/v3.13.0/chart-testing_3.13.0_linux_amd64.tar.gz
336-
echo "fcbae93a01887730054b5b0b4536b8cfbfe6010fdffccf66b8b87f5f764287d9 chart-testing_3.13.0_linux_amd64.tar.gz" | sha256sum -c
337-
tar -xf chart-testing_3.13.0_linux_amd64.tar.gz
338-
sudo mv ct /usr/local/bin/ct
339-
sudo mkdir -p /etc/ct
340-
sudo mv etc/chart_schema.yaml /etc/ct/chart_schema.yaml
341-
sudo mv etc/lintconf.yaml /etc/ct/lintconf.yaml
338+
- name: Set up chart-testing
339+
uses: helm/[email protected]
340+
- name: Create kind cluster
341+
uses: helm/[email protected]
342342
- name: Setup Kind cluster
343343
run: |
344-
./.cirrus/setup_kind_vm.sh
345-
kind create cluster
346-
kubectl cluster-info --context kind-kind
344+
# ./.cirrus/setup_kind_vm.sh
345+
kubectl cluster-info --context kind-chart-testing
347346
kubectl get nodes
347+
kubectl describe node chart-testing-control-plane
348348
- name: Setup Istio
349349
run: |
350350
helm repo add istio https://istio-release.storage.googleapis.com/charts
351351
kubectl create namespace istio-system --dry-run=client -o yaml | kubectl apply -f -
352352
helm upgrade -i istio-base istio/base -n istio-system --set defaultRevision=default --set global.proxy.holdApplicationUntilProxyStarts=true --wait
353-
helm upgrade -i istiod istio/istiod --set global.proxy.holdApplicationUntilProxyStarts=true -n istio-system --wait
353+
helm upgrade -i istiod istio/istiod --set global.proxy.holdApplicationUntilProxyStarts=true --set resources.requests.cpu=100m -n istio-system --wait
354354
kubectl create namespace test --dry-run=client -o yaml | kubectl apply -f -
355355
kubectl label namespace test istio-injection=enabled
356-
- id: secrets
356+
- id: dcesecrets
357357
uses: SonarSource/[email protected]
358358
with:
359359
secrets: |
360360
development/kv/data/docker/sonardockerrw username | DOCKER_USERNAME;
361361
development/kv/data/docker/sonardockerrw access_token_rwd | DOCKER_PASSWORD;
362362
- name: Setup docker registry secret
363363
env:
364-
DOCKER_USERNAME: ${{ fromJSON(steps.secrets.outputs.vault).DOCKER_USERNAME }}
365-
DOCKER_PASSWORD: ${{ fromJSON(steps.secrets.outputs.vault).DOCKER_PASSWORD }}
364+
DOCKER_USERNAME: ${{ fromJSON(steps.dcesecrets.outputs.vault).DOCKER_USERNAME }}
365+
DOCKER_PASSWORD: ${{ fromJSON(steps.dcesecrets.outputs.vault).DOCKER_PASSWORD }}
366366
run: kubectl create secret docker-registry pullsecret --namespace test --docker-username=${DOCKER_USERNAME} --docker-password=${DOCKER_PASSWORD} --dry-run=client -o yaml | kubectl apply -f -
367+
- name: Install ArtifactHub CLI
368+
run: |
369+
curl -LO https://github.com/artifacthub/hub/releases/download/v1.21.0/ah_1.21.0_linux_amd64.tar.gz
370+
echo "48d6b87b60baf4ee8fd5efbfec3bf5fb3ca783ab3f1dab625e64332b95df2a84 ah_1.21.0_linux_amd64.tar.gz" | sha256sum -c
371+
mkdir -p /tmp/artifacthub
372+
tar -xf ah_1.21.0_linux_amd64.tar.gz -C /tmp/artifacthub
373+
sudo mv /tmp/artifacthub/ah /usr/local/bin/ah
374+
rm -rf /tmp/artifacthub ah_1.21.0_linux_amd64.tar.gz
367375
- name: Run ArtifactHub lint
368376
run: ah lint
369377
- name: Run chart testing

‎charts/sonarqube-dce/ci/cirrus-values.yaml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,32 @@
22
# decreased replica count for cirrus CI
33

44
searchNodes:
5-
replicaCount: 3
5+
replicaCount: 2
66
image:
77
repository: "sonarsource/sonarqube"
88
tag: "2025.4.0-datacenter-search"
99
pullSecrets:
1010
- name: pullsecret
11+
resources:
12+
limits:
13+
cpu: 800m
14+
memory: 1024M
15+
ephemeral-storage: 512000M
16+
requests:
17+
cpu: 100m
18+
memory: 1024M
19+
ephemeral-storage: 1536M
1120

1221
ApplicationNodes:
22+
resources:
23+
limits:
24+
cpu: 800m
25+
memory: 1024M
26+
ephemeral-storage: 512000M
27+
requests:
28+
cpu: 100m
29+
memory: 1024M
30+
ephemeral-storage: 1536M
1331
replicaCount: 2
1432
jwtSecret: "mnGBJtmwRbIREqy3vSw6Cinoi2WEom9JH+iw/tXOJX4="
1533
image:
@@ -29,3 +47,14 @@ postgresql:
2947
fsGroup: 1001
3048

3149
monitoringPasscode: "test"
50+
51+
tests:
52+
resources:
53+
requests:
54+
cpu: 50m
55+
memory: 200M
56+
ephemeral-storage: 100M
57+
limits:
58+
cpu: 50m
59+
memory: 200M
60+
ephemeral-storage: 1000M

‎charts/sonarqube/ci/cirrus-values.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,24 @@ postgresql:
1414
# fsGroup and runAsUser specifications below are not applied if enabled=false. enabled=false is the required setting for OpenShift "restricted SCC" to work successfully.
1515
# postgresql dockerfile sets user as 1001
1616
fsGroup: 1001
17+
18+
resources:
19+
limits:
20+
cpu: 800m
21+
memory: 6144M
22+
ephemeral-storage: 512000M
23+
requests:
24+
cpu: 200m
25+
memory: 2048M
26+
ephemeral-storage: 1536M
27+
28+
tests:
29+
resources:
30+
requests:
31+
cpu: 50m
32+
memory: 200M
33+
ephemeral-storage: 100M
34+
limits:
35+
cpu: 50m
36+
memory: 200M
37+
ephemeral-storage: 1000M

‎mise.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ python = "3.12"
99
go = "1.23"
1010
# Kind for local Kubernetes testing
1111
kind = "0.26.0"
12-
# ArtifactHub CLI for linting
13-
ah = "1.21.0"

0 commit comments

Comments
 (0)