Skip to content

Commit

Permalink
SQDEVOPS-316 Removes duplicated proxy-body-size
Browse files Browse the repository at this point in the history
  • Loading branch information
@davividal
davividal authored Nov 14, 2023
1 parent 36f3b92 commit 239271b
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 35 deletions.
1 change: 1 addition & 0 deletions charts/sonarqube-dce/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ All changes to this chart will be documented in this file.
* Avoid duplicate SONAR_WEB_SYSTEMPASSCODE secrets
* Deprecate embedded PostgreSQL
* Update nginx-ingress-controller dependency to version 4.8.3, please carefully read the changelog of this new major version.
* Remove duplicated 'proxy-body-size' from ingress annotation.

## [10.2.0]
* Update SonarQube to 10.2.0
Expand Down
2 changes: 2 additions & 0 deletions charts/sonarqube-dce/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ annotations:
description: "Deprecate embedded PostgreSQL"
- kind: changed
description: "Update nginx-ingress-controller dependency to version 4.8.3, please carefully read the changelog of this new major version."
- kind: fixed
description: "Remove duplicated 'proxy-body-size' from ingress annotation."
artifacthub.io/links: |
- name: support
url: https://community.sonarsource.com/
Expand Down
24 changes: 12 additions & 12 deletions charts/sonarqube-dce/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,18 +344,18 @@ The following table lists the configurable parameters of the SonarQube chart and

### Ingress

| Parameter | Description | Default |
| ------------------------------ | ------------------------------------------------------------ | --------------------------------------------------------------------------- |
| `nginx.enabled` | Also install Nginx Ingress Helm | `false` |
| `ingress.enabled` | Flag to enable Ingress | `false` |
| `ingress.labels` | Ingress additional labels | `{}` |
| `ingress.hosts[0].name` | Hostname to your SonarQube installation | `sonarqube.your-org.com` |
| `ingress.hosts[0].path` | Path within the URL structure | `/` |
| `ingress.hosts[0].serviceName` | Optional field to override the default serviceName of a path | `None` |
| `ingress.hosts[0].servicePort` | Optional field to override the default servicePort of a path | `None` |
| `ingress.tls` | Ingress secrets for TLS certificates | `[]` |
| `ingress.ingressClassName` | Optional field to configure ingress class name | `None` |
| `ingress.annotations` | Field to add extra annotations to the ingress | {`nginx.org/proxy-body-size: "64m"`} if `nginx.enabled=true` |
| Parameter | Description | Default |
| ------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------------------------ |
| `nginx.enabled` | Also install Nginx Ingress Helm | `false` |
| `ingress.enabled` | Flag to enable Ingress | `false` |
| `ingress.labels` | Ingress additional labels | `{}` |
| `ingress.hosts[0].name` | Hostname to your SonarQube installation | `sonarqube.your-org.com` |
| `ingress.hosts[0].path` | Path within the URL structure | `/` |
| `ingress.hosts[0].serviceName` | Optional field to override the default serviceName of a path | `None` |
| `ingress.hosts[0].servicePort` | Optional field to override the default servicePort of a path | `None` |
| `ingress.tls` | Ingress secrets for TLS certificates | `[]` |
| `ingress.ingressClassName` | Optional field to configure ingress class name | `None` |
| `ingress.annotations` | Field to add extra annotations to the ingress | {`nginx.ingress.kubernetes.io/proxy-body-size: "64m"`} if `nginx.enabled=true` |

### InitContainers

Expand Down
5 changes: 3 additions & 2 deletions charts/sonarqube-dce/templates/NOTES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ WARNING: The embedded PostgreSQL is intended for evaluation only, it is DEPRECAT
Please visit https://artifacthub.io/packages/helm/sonarqube/sonarqube#production-use-case for more information.
{{- end }}
{{ if .Values.nginx.enabled }}
WARNING: The ingress nginx controller dependeny has been upgraded to a major version (4.x), please carefully read the changelogs [here](https://github.com/kubernetes/ingress-nginx/releases) and [here](https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog).
{{- end }}
WARNING: The ingress nginx controller dependency has been upgraded to a major version (4.x), please carefully read the changelogs at https://github.com/kubernetes/ingress-nginx/releases and refer to the documentation at https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/.
Please also visit https://artifacthub.io/packages/helm/sonarqube/sonarqube#production-use-case for more information.
{{- end }}
4 changes: 2 additions & 2 deletions charts/sonarqube-dce/templates/ingress.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ metadata:
{{- range $key, $value := .Values.ingress.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if and .Values.nginx.enabled (not (hasKey (.Values.ingress.annotations) "nginx.org/proxy-body-size/proxy-body-size")) }}
nginx.org/proxy-body-size: "64m"
{{- if and .Values.nginx.enabled (not (hasKey (.Values.ingress.annotations) "nginx.ingress.kubernetes.io/proxy-body-size")) }}
nginx.ingress.kubernetes.io/proxy-body-size: "64m"
{{- end -}}
{{- end }}
spec:
Expand Down
24 changes: 12 additions & 12 deletions charts/sonarqube/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,18 +247,18 @@ The following table lists the configurable parameters of the SonarQube chart and

### Ingress

| Parameter | Description | Default |
| ------------------------------ | ------------------------------------------------------------ | --------------------------------------------------------------------------- |
| `nginx.enabled` | Also install Nginx Ingress Helm | `false` |
| `ingress.enabled` | Flag to enable Ingress | `false` |
| `ingress.labels` | Ingress additional labels | `{}` |
| `ingress.hosts[0].name` | Hostname to your SonarQube installation | `sonarqube.your-org.com` |
| `ingress.hosts[0].path` | Path within the URL structure | `/` |
| `ingress.hosts[0].serviceName` | Optional field to override the default serviceName of a path | `None` |
| `ingress.hosts[0].servicePort` | Optional field to override the default servicePort of a path | `None` |
| `ingress.tls` | Ingress secrets for TLS certificates | `[]` |
| `ingress.ingressClassName` | Optional field to configure ingress class name | `None` |
| `ingress.annotations` | Field to add extra annotations to the ingress | {`nginx.org/proxy-body-size: "64m"`} if `nginx.enabled=true` |
| Parameter | Description | Default |
| ------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------------------------ |
| `nginx.enabled` | Also install Nginx Ingress Helm | `false` |
| `ingress.enabled` | Flag to enable Ingress | `false` |
| `ingress.labels` | Ingress additional labels | `{}` |
| `ingress.hosts[0].name` | Hostname to your SonarQube installation | `sonarqube.your-org.com` |
| `ingress.hosts[0].path` | Path within the URL structure | `/` |
| `ingress.hosts[0].serviceName` | Optional field to override the default serviceName of a path | `None` |
| `ingress.hosts[0].servicePort` | Optional field to override the default servicePort of a path | `None` |
| `ingress.tls` | Ingress secrets for TLS certificates | `[]` |
| `ingress.ingressClassName` | Optional field to configure ingress class name | `None` |
| `ingress.annotations` | Field to add extra annotations to the ingress | {`nginx.ingress.kubernetes.io/proxy-body-size: "64m"`} if `nginx.enabled=true` |

### Route

Expand Down
5 changes: 3 additions & 2 deletions charts/sonarqube/templates/NOTES.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ WARNING: The embedded PostgreSQL is intended for evaluation only, it is DEPRECAT
Please visit https://artifacthub.io/packages/helm/sonarqube/sonarqube#production-use-case for more information.
{{- end }}
{{ if .Values.nginx.enabled }}
WARNING: The ingress nginx controller dependeny has been upgraded to a major version (4.x), please carefully read the changelogs [here](https://github.com/kubernetes/ingress-nginx/releases) and [here](https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog).
{{- end }}
WARNING: The ingress nginx controller dependency has been upgraded to a major version (4.x), please carefully read the changelogs at https://github.com/kubernetes/ingress-nginx/releases and refer to the documentation at https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/.
Please also visit https://artifacthub.io/packages/helm/sonarqube/sonarqube#production-use-case for more information.
{{- end }}
4 changes: 2 additions & 2 deletions charts/sonarqube/templates/ingress.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if and .Values.nginx.enabled (not (hasKey (.Values.ingress.annotations) "nginx.ingress.kubernetes.io/proxy-body-size")) }}
nginx.org/proxy-body-size: "64m"
nginx.ingress.kubernetes.io/proxy-body-size: "64m"
{{- end -}}
{{- end }}
spec:
Expand All @@ -43,4 +43,4 @@ spec:
tls:
{{ toYaml .Values.ingress.tls | indent 4 }}
{{- end -}}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion tests/dynamic-compatibility-test/sonarqube-dce/all-values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ searchNodes:

# tests/unit-compatibility-test/sonarqube-dce/secret-values.yaml
# tests/unit-compatibility-test/sonarqube-dce/service-values.yaml
# tests/unit-compatibility-test/sonarqube-dce/serviceaccount-values.yaml
# tests/unit-compatibility-test/sonarqube-dce/serviceaccount-values.yaml
2 changes: 1 addition & 1 deletion tests/unit-compatibility-test/sonarqube-dce/ingress-values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ingress:
tls:
- secretName: chart-example-tls
hosts:
- chart-example.local
- chart-example.local
2 changes: 1 addition & 1 deletion tests/unit-compatibility-test/sonarqube/ingress-values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ ingress:
tls:
- secretName: chart-example-tls
hosts:
- chart-example.local
- chart-example.local

0 comments on commit 239271b

Please sign in to comment.