Skip to content

Commit 3b7c9d9

Browse files
NO-JIRA Fix missing package generation on non-LTA branches
1 parent a849fe0 commit 3b7c9d9

35 files changed

+573
-570
lines changed

.cirrus/package.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,14 @@ set -xeuo pipefail
1010

1111
PREVIOUS_RELEASE=$(gh api "/repos/{owner}/{repo}/releases" --jq "[.[] | select(.target_commitish==\"${TARGET_BRANCH}\")][1].tag_name")
1212

13-
# There MIGHT be a some edge case where PREVIOUS_RELEASE shouldn't be HEAD,
14-
# for example, releasing a patch for non-LTA. To be investigated.
15-
[[ -z "${PREVIOUS_RELEASE}" ]] && PREVIOUS_RELEASE="HEAD" || echo "${PREVIOUS_RELEASE}"
16-
17-
CHARTS=$(ct list-changed --since "${PREVIOUS_RELEASE}" --target-branch "${TARGET_BRANCH}")
13+
[[ -z "${PREVIOUS_RELEASE}" ]] && CHARTS=("charts/sonarqube-dce" "charts/sonarqube") || CHARTS=$(ct list-changed --since "${PREVIOUS_RELEASE}" --target-branch "${TARGET_BRANCH}")
1814

1915
BUILD_METADATA="-${BUILD_NUMBER}"
2016
[[ ${CIRRUS_RELEASE:-} != "" ]] && BUILD_METADATA=""
2117

22-
echo "${CHARTS}"
18+
echo "${CHARTS[@]}"
2319

24-
for chart in ${CHARTS}; do
20+
for chart in ${CHARTS[@]}; do
2521
_original_version=$(yq '.version' "${chart}"/Chart.yaml)
2622
_new_version="${_original_version}${BUILD_METADATA}"
2723
helm dependency build "${chart}"

charts/sonarqube-dce/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ All changes to this chart will be documented in this file.
55
* Update Chart's version to 2025.1.0
66
* Update ingress-nginx subchart to 4.11.3
77

8+
## [10.8.1]
9+
* Update Chart's version to 10.8.1
10+
* Upgrade SonarQube Server to 10.8.1
11+
812
## [10.8.0]
913
* Update Chart's version to 10.8.0
1014
* Upgrade SonarQube Server to 10.8.0

charts/sonarqube-dce/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: sonarqube-dce
33
description: SonarQube is a self-managed, automatic code review tool that systematically helps you deliver clean code. As a core element of our Sonar solution, SonarQube integrates into your existing workflow and detects issues in your code to help you perform continuous code inspections of your projects. The tool analyses 30+ different programming languages and integrates into your CI pipeline and DevOps platform to ensure that your code meets high-quality standards.
44
type: application
55
version: 2025.1.0
6-
appVersion: 10.8.0
6+
appVersion: 10.8.1
77
keywords:
88
- coverage
99
- security

charts/sonarqube/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: sonarqube
33
description: SonarQube is a self-managed, automatic code review tool that systematically helps you deliver clean code. As a core element of our Sonar solution, SonarQube integrates into your existing workflow and detects issues in your code to help you perform continuous code inspections of your projects. The tool analyses 30+ different programming languages and integrates into your CI pipeline and DevOps platform to ensure that your code meets high-quality standards.
44
type: application
5-
version: 2025.1.1
5+
version: 2025.1.0
66
appVersion: 10.8.1
77
keywords:
88
- coverage

tests/unit-compatibility-test/fixtures/sonarqube-dce/ingress-with-controller.yaml

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ apiVersion: v1
3838
kind: ServiceAccount
3939
metadata:
4040
labels:
41-
helm.sh/chart: ingress-nginx-4.10.1
41+
helm.sh/chart: ingress-nginx-4.11.3
4242
app.kubernetes.io/name: ingress-nginx
4343
app.kubernetes.io/instance: ingress-with-controller.yaml
44-
app.kubernetes.io/version: "1.10.1"
44+
app.kubernetes.io/version: "1.11.3"
4545
app.kubernetes.io/part-of: ingress-nginx
4646
app.kubernetes.io/managed-by: Helm
4747
app.kubernetes.io/component: controller
@@ -119,10 +119,10 @@ apiVersion: v1
119119
kind: ConfigMap
120120
metadata:
121121
labels:
122-
helm.sh/chart: ingress-nginx-4.10.1
122+
helm.sh/chart: ingress-nginx-4.11.3
123123
app.kubernetes.io/name: ingress-nginx
124124
app.kubernetes.io/instance: ingress-with-controller.yaml
125-
app.kubernetes.io/version: "1.10.1"
125+
app.kubernetes.io/version: "1.11.3"
126126
app.kubernetes.io/part-of: ingress-nginx
127127
app.kubernetes.io/managed-by: Helm
128128
app.kubernetes.io/component: controller
@@ -252,10 +252,10 @@ apiVersion: rbac.authorization.k8s.io/v1
252252
kind: ClusterRole
253253
metadata:
254254
labels:
255-
helm.sh/chart: ingress-nginx-4.10.1
255+
helm.sh/chart: ingress-nginx-4.11.3
256256
app.kubernetes.io/name: ingress-nginx
257257
app.kubernetes.io/instance: ingress-with-controller.yaml
258-
app.kubernetes.io/version: "1.10.1"
258+
app.kubernetes.io/version: "1.11.3"
259259
app.kubernetes.io/part-of: ingress-nginx
260260
app.kubernetes.io/managed-by: Helm
261261
name: ingress-with-controller.yaml-ingress-nginx
@@ -336,10 +336,10 @@ apiVersion: rbac.authorization.k8s.io/v1
336336
kind: ClusterRoleBinding
337337
metadata:
338338
labels:
339-
helm.sh/chart: ingress-nginx-4.10.1
339+
helm.sh/chart: ingress-nginx-4.11.3
340340
app.kubernetes.io/name: ingress-nginx
341341
app.kubernetes.io/instance: ingress-with-controller.yaml
342-
app.kubernetes.io/version: "1.10.1"
342+
app.kubernetes.io/version: "1.11.3"
343343
app.kubernetes.io/part-of: ingress-nginx
344344
app.kubernetes.io/managed-by: Helm
345345
name: ingress-with-controller.yaml-ingress-nginx
@@ -357,10 +357,10 @@ apiVersion: rbac.authorization.k8s.io/v1
357357
kind: Role
358358
metadata:
359359
labels:
360-
helm.sh/chart: ingress-nginx-4.10.1
360+
helm.sh/chart: ingress-nginx-4.11.3
361361
app.kubernetes.io/name: ingress-nginx
362362
app.kubernetes.io/instance: ingress-with-controller.yaml
363-
app.kubernetes.io/version: "1.10.1"
363+
app.kubernetes.io/version: "1.11.3"
364364
app.kubernetes.io/part-of: ingress-nginx
365365
app.kubernetes.io/managed-by: Helm
366366
app.kubernetes.io/component: controller
@@ -451,10 +451,10 @@ apiVersion: rbac.authorization.k8s.io/v1
451451
kind: RoleBinding
452452
metadata:
453453
labels:
454-
helm.sh/chart: ingress-nginx-4.10.1
454+
helm.sh/chart: ingress-nginx-4.11.3
455455
app.kubernetes.io/name: ingress-nginx
456456
app.kubernetes.io/instance: ingress-with-controller.yaml
457-
app.kubernetes.io/version: "1.10.1"
457+
app.kubernetes.io/version: "1.11.3"
458458
app.kubernetes.io/part-of: ingress-nginx
459459
app.kubernetes.io/managed-by: Helm
460460
app.kubernetes.io/component: controller
@@ -474,10 +474,10 @@ apiVersion: v1
474474
kind: Service
475475
metadata:
476476
labels:
477-
helm.sh/chart: ingress-nginx-4.10.1
477+
helm.sh/chart: ingress-nginx-4.11.3
478478
app.kubernetes.io/name: ingress-nginx
479479
app.kubernetes.io/instance: ingress-with-controller.yaml
480-
app.kubernetes.io/version: "1.10.1"
480+
app.kubernetes.io/version: "1.11.3"
481481
app.kubernetes.io/part-of: ingress-nginx
482482
app.kubernetes.io/managed-by: Helm
483483
app.kubernetes.io/component: controller
@@ -501,10 +501,10 @@ kind: Service
501501
metadata:
502502
annotations:
503503
labels:
504-
helm.sh/chart: ingress-nginx-4.10.1
504+
helm.sh/chart: ingress-nginx-4.11.3
505505
app.kubernetes.io/name: ingress-nginx
506506
app.kubernetes.io/instance: ingress-with-controller.yaml
507-
app.kubernetes.io/version: "1.10.1"
507+
app.kubernetes.io/version: "1.11.3"
508508
app.kubernetes.io/part-of: ingress-nginx
509509
app.kubernetes.io/managed-by: Helm
510510
app.kubernetes.io/component: controller
@@ -689,10 +689,10 @@ apiVersion: apps/v1
689689
kind: Deployment
690690
metadata:
691691
labels:
692-
helm.sh/chart: ingress-nginx-4.10.1
692+
helm.sh/chart: ingress-nginx-4.11.3
693693
app.kubernetes.io/name: ingress-nginx
694694
app.kubernetes.io/instance: ingress-with-controller.yaml
695-
app.kubernetes.io/version: "1.10.1"
695+
app.kubernetes.io/version: "1.11.3"
696696
app.kubernetes.io/part-of: ingress-nginx
697697
app.kubernetes.io/managed-by: Helm
698698
app.kubernetes.io/component: controller
@@ -710,18 +710,18 @@ spec:
710710
template:
711711
metadata:
712712
labels:
713-
helm.sh/chart: ingress-nginx-4.10.1
713+
helm.sh/chart: ingress-nginx-4.11.3
714714
app.kubernetes.io/name: ingress-nginx
715715
app.kubernetes.io/instance: ingress-with-controller.yaml
716-
app.kubernetes.io/version: "1.10.1"
716+
app.kubernetes.io/version: "1.11.3"
717717
app.kubernetes.io/part-of: ingress-nginx
718718
app.kubernetes.io/managed-by: Helm
719719
app.kubernetes.io/component: controller
720720
spec:
721721
dnsPolicy: ClusterFirst
722722
containers:
723723
- name: controller
724-
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
724+
image: registry.k8s.io/ingress-nginx/controller:v1.11.3@sha256:d56f135b6462cfc476447cfe564b83a45e8bb7da2774963b00d12161112270b7
725725
imagePullPolicy: IfNotPresent
726726
lifecycle:
727727
preStop:
@@ -1405,10 +1405,10 @@ apiVersion: networking.k8s.io/v1
14051405
kind: IngressClass
14061406
metadata:
14071407
labels:
1408-
helm.sh/chart: ingress-nginx-4.10.1
1408+
helm.sh/chart: ingress-nginx-4.11.3
14091409
app.kubernetes.io/name: ingress-nginx
14101410
app.kubernetes.io/instance: ingress-with-controller.yaml
1411-
app.kubernetes.io/version: "1.10.1"
1411+
app.kubernetes.io/version: "1.11.3"
14121412
app.kubernetes.io/part-of: ingress-nginx
14131413
app.kubernetes.io/managed-by: Helm
14141414
app.kubernetes.io/component: controller
@@ -1461,10 +1461,10 @@ kind: ValidatingWebhookConfiguration
14611461
metadata:
14621462
annotations:
14631463
labels:
1464-
helm.sh/chart: ingress-nginx-4.10.1
1464+
helm.sh/chart: ingress-nginx-4.11.3
14651465
app.kubernetes.io/name: ingress-nginx
14661466
app.kubernetes.io/instance: ingress-with-controller.yaml
1467-
app.kubernetes.io/version: "1.10.1"
1467+
app.kubernetes.io/version: "1.11.3"
14681468
app.kubernetes.io/part-of: ingress-nginx
14691469
app.kubernetes.io/managed-by: Helm
14701470
app.kubernetes.io/component: admission-webhook
@@ -1490,6 +1490,7 @@ webhooks:
14901490
service:
14911491
name: ingress-with-controller.yaml-ingress-nginx-controller-admission
14921492
namespace: default
1493+
port: 443
14931494
path: /networking/v1/ingresses
14941495
---
14951496
# Source: sonarqube-dce/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
@@ -1502,13 +1503,14 @@ metadata:
15021503
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
15031504
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
15041505
labels:
1505-
helm.sh/chart: ingress-nginx-4.10.1
1506+
helm.sh/chart: ingress-nginx-4.11.3
15061507
app.kubernetes.io/name: ingress-nginx
15071508
app.kubernetes.io/instance: ingress-with-controller.yaml
1508-
app.kubernetes.io/version: "1.10.1"
1509+
app.kubernetes.io/version: "1.11.3"
15091510
app.kubernetes.io/part-of: ingress-nginx
15101511
app.kubernetes.io/managed-by: Helm
15111512
app.kubernetes.io/component: admission-webhook
1513+
automountServiceAccountToken: true
15121514
---
15131515
# Source: sonarqube-dce/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml
15141516
apiVersion: rbac.authorization.k8s.io/v1
@@ -1519,10 +1521,10 @@ metadata:
15191521
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
15201522
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
15211523
labels:
1522-
helm.sh/chart: ingress-nginx-4.10.1
1524+
helm.sh/chart: ingress-nginx-4.11.3
15231525
app.kubernetes.io/name: ingress-nginx
15241526
app.kubernetes.io/instance: ingress-with-controller.yaml
1525-
app.kubernetes.io/version: "1.10.1"
1527+
app.kubernetes.io/version: "1.11.3"
15261528
app.kubernetes.io/part-of: ingress-nginx
15271529
app.kubernetes.io/managed-by: Helm
15281530
app.kubernetes.io/component: admission-webhook
@@ -1544,10 +1546,10 @@ metadata:
15441546
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
15451547
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
15461548
labels:
1547-
helm.sh/chart: ingress-nginx-4.10.1
1549+
helm.sh/chart: ingress-nginx-4.11.3
15481550
app.kubernetes.io/name: ingress-nginx
15491551
app.kubernetes.io/instance: ingress-with-controller.yaml
1550-
app.kubernetes.io/version: "1.10.1"
1552+
app.kubernetes.io/version: "1.11.3"
15511553
app.kubernetes.io/part-of: ingress-nginx
15521554
app.kubernetes.io/managed-by: Helm
15531555
app.kubernetes.io/component: admission-webhook
@@ -1570,10 +1572,10 @@ metadata:
15701572
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
15711573
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
15721574
labels:
1573-
helm.sh/chart: ingress-nginx-4.10.1
1575+
helm.sh/chart: ingress-nginx-4.11.3
15741576
app.kubernetes.io/name: ingress-nginx
15751577
app.kubernetes.io/instance: ingress-with-controller.yaml
1576-
app.kubernetes.io/version: "1.10.1"
1578+
app.kubernetes.io/version: "1.11.3"
15771579
app.kubernetes.io/part-of: ingress-nginx
15781580
app.kubernetes.io/managed-by: Helm
15791581
app.kubernetes.io/component: admission-webhook
@@ -1596,10 +1598,10 @@ metadata:
15961598
"helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
15971599
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
15981600
labels:
1599-
helm.sh/chart: ingress-nginx-4.10.1
1601+
helm.sh/chart: ingress-nginx-4.11.3
16001602
app.kubernetes.io/name: ingress-nginx
16011603
app.kubernetes.io/instance: ingress-with-controller.yaml
1602-
app.kubernetes.io/version: "1.10.1"
1604+
app.kubernetes.io/version: "1.11.3"
16031605
app.kubernetes.io/part-of: ingress-nginx
16041606
app.kubernetes.io/managed-by: Helm
16051607
app.kubernetes.io/component: admission-webhook
@@ -1661,10 +1663,10 @@ metadata:
16611663
"helm.sh/hook": pre-install,pre-upgrade
16621664
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
16631665
labels:
1664-
helm.sh/chart: ingress-nginx-4.10.1
1666+
helm.sh/chart: ingress-nginx-4.11.3
16651667
app.kubernetes.io/name: ingress-nginx
16661668
app.kubernetes.io/instance: ingress-with-controller.yaml
1667-
app.kubernetes.io/version: "1.10.1"
1669+
app.kubernetes.io/version: "1.11.3"
16681670
app.kubernetes.io/part-of: ingress-nginx
16691671
app.kubernetes.io/managed-by: Helm
16701672
app.kubernetes.io/component: admission-webhook
@@ -1673,17 +1675,17 @@ spec:
16731675
metadata:
16741676
name: ingress-with-controller.yaml-ingress-nginx-admission-create
16751677
labels:
1676-
helm.sh/chart: ingress-nginx-4.10.1
1678+
helm.sh/chart: ingress-nginx-4.11.3
16771679
app.kubernetes.io/name: ingress-nginx
16781680
app.kubernetes.io/instance: ingress-with-controller.yaml
1679-
app.kubernetes.io/version: "1.10.1"
1681+
app.kubernetes.io/version: "1.11.3"
16801682
app.kubernetes.io/part-of: ingress-nginx
16811683
app.kubernetes.io/managed-by: Helm
16821684
app.kubernetes.io/component: admission-webhook
16831685
spec:
16841686
containers:
16851687
- name: create
1686-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366
1688+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.4@sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f
16871689
imagePullPolicy: IfNotPresent
16881690
args:
16891691
- create
@@ -1720,10 +1722,10 @@ metadata:
17201722
"helm.sh/hook": post-install,post-upgrade
17211723
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
17221724
labels:
1723-
helm.sh/chart: ingress-nginx-4.10.1
1725+
helm.sh/chart: ingress-nginx-4.11.3
17241726
app.kubernetes.io/name: ingress-nginx
17251727
app.kubernetes.io/instance: ingress-with-controller.yaml
1726-
app.kubernetes.io/version: "1.10.1"
1728+
app.kubernetes.io/version: "1.11.3"
17271729
app.kubernetes.io/part-of: ingress-nginx
17281730
app.kubernetes.io/managed-by: Helm
17291731
app.kubernetes.io/component: admission-webhook
@@ -1732,17 +1734,17 @@ spec:
17321734
metadata:
17331735
name: ingress-with-controller.yaml-ingress-nginx-admission-patch
17341736
labels:
1735-
helm.sh/chart: ingress-nginx-4.10.1
1737+
helm.sh/chart: ingress-nginx-4.11.3
17361738
app.kubernetes.io/name: ingress-nginx
17371739
app.kubernetes.io/instance: ingress-with-controller.yaml
1738-
app.kubernetes.io/version: "1.10.1"
1740+
app.kubernetes.io/version: "1.11.3"
17391741
app.kubernetes.io/part-of: ingress-nginx
17401742
app.kubernetes.io/managed-by: Helm
17411743
app.kubernetes.io/component: admission-webhook
17421744
spec:
17431745
containers:
17441746
- name: patch
1745-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366
1747+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.4@sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f
17461748
imagePullPolicy: IfNotPresent
17471749
args:
17481750
- patch

0 commit comments

Comments
 (0)