Skip to content

Commit 4c240fe

Browse files
carminevassallocarminevassallo
committed
SONAR-25700 Update the repository used by postgresql's image to bitnamylegacy
1 parent 5e9429a commit 4c240fe

File tree

64 files changed

+680
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+680
-620
lines changed

‎charts/sonarqube-dce/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ All changes to this chart will be documented in this file.
44
## [2025.1.3]
55
* Update Chart's version to 2025.1.3
66
* Upgrade SonarQube Server to 2025.1.3
7+
* Update the image repository and readinessProbe used by postgresql after they migrated to a legacy repository
78

89
## [2025.1.2]
910
* Update Chart's version to 2025.1.2

‎charts/sonarqube-dce/Chart.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ annotations:
2929
description: "Update Chart's version to 2025.1.3"
3030
- kind: changed
3131
description: "Upgrade SonarQube Server to 2025.1.3"
32+
- kind: changed
33+
description: "Update the image repository and readinessProbe used by postgresql after they migrated to a legacy repository"
3234
artifacthub.io/links: |
3335
- name: support
3436
url: https://community.sonarsource.com/

‎charts/sonarqube-dce/values.yaml‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,8 +701,32 @@ postgresql:
701701
# imageRegistry: ''
702702
# imagePullSecrets: ''
703703
## bitnami/postgres image tag
704-
# image:
705-
# tag: 11.7.0-debian-10-r9
704+
image:
705+
repository: "bitnamilegacy/postgresql"
706+
# tag: 11.14.0-debian-10-r22
707+
# Set the readiness probe to avoid that the initialization scripts' are not completed before marking the pod as ready.
708+
readinessProbe:
709+
enabled: false
710+
customReadinessProbe:
711+
exec:
712+
command:
713+
- /bin/sh
714+
- -c
715+
- -e
716+
- |
717+
{{- if (include "postgresql.database" .) }}
718+
exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if .Values.tls.enabled }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
719+
{{- else }}
720+
exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if .Values.tls.enabled }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
721+
{{- end }}
722+
{{- if contains "bitnamilegacy/" .Values.image.repository }}
723+
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
724+
{{- end }}
725+
failureThreshold: 6
726+
initialDelaySeconds: 5
727+
periodSeconds: 10
728+
successThreshold: 1
729+
timeoutSeconds: 5
706730
# existingSecret Name of existing secret to use for PostgreSQL passwords
707731
# The secret has to contain the keys postgresql-password which is the password for postgresqlUsername when it is
708732
# different of postgres, postgresql-postgres-password which will override postgresqlPassword,

‎charts/sonarqube/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ All changes to this chart will be documented in this file.
44
## [2025.1.3]
55
* Update Chart's version to 2025.1.3
66
* Upgrade SonarQube Server to 2025.1.3
7+
* Update the image repository and readinessProbe used by postgresql after they migrated to a legacy repository
78

89
## [2025.1.2]
910
* Update Chart's version to 2025.1.2

‎charts/sonarqube/Chart.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ annotations:
3434
description: "Update Chart's version to 2025.1.3"
3535
- kind: changed
3636
description: "Upgrade SonarQube Server to 2025.1.3"
37+
- kind: changed
38+
description: "Update the image repository and readinessProbe used by postgresql after they migrated to a legacy repository"
3739
artifacthub.io/containsSecurityUpdates: "false"
3840
artifacthub.io/images: |
3941
- name: sonarqube

‎charts/sonarqube/values.yaml‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,32 @@ postgresql:
544544
# imageRegistry: ''
545545
# imagePullSecrets: ''
546546
## bitnami/postgres image tag
547-
# image:
548-
# tag: 11.7.0-debian-10-r9
547+
image:
548+
repository: "bitnamilegacy/postgresql"
549+
# tag: 11.14.0-debian-10-r22
550+
# Set the readiness probe to avoid that the initialization scripts' are not completed before marking the pod as ready.
551+
readinessProbe:
552+
enabled: false
553+
customReadinessProbe:
554+
exec:
555+
command:
556+
- /bin/sh
557+
- -c
558+
- -e
559+
- |
560+
{{- if (include "postgresql.database" .) }}
561+
exec pg_isready -U {{ include "postgresql.username" . | quote }} -d "dbname={{ include "postgresql.database" . }} {{- if .Values.tls.enabled }} sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}{{- end }}" -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
562+
{{- else }}
563+
exec pg_isready -U {{ include "postgresql.username" . | quote }} {{- if .Values.tls.enabled }} -d "sslcert={{ include "postgresql.tlsCert" . }} sslkey={{ include "postgresql.tlsCertKey" . }}"{{- end }} -h 127.0.0.1 -p {{ .Values.containerPorts.postgresql }}
564+
{{- end }}
565+
{{- if contains "bitnamilegacy/" .Values.image.repository }}
566+
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
567+
{{- end }}
568+
failureThreshold: 6
569+
initialDelaySeconds: 5
570+
periodSeconds: 10
571+
successThreshold: 1
572+
timeoutSeconds: 5
549573
# existingSecret Name of existing secret to use for PostgreSQL passwords
550574
# The secret has to contain the keys postgresql-password which is the password for postgresqlUsername when it is
551575
# different of postgres, postgresql-postgres-password which will override postgresqlPassword,

‎tests/unit-compatibility-test/fixtures/sonarqube-dce/application-values.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ spec:
618618
automountServiceAccountToken: false
619619
containers:
620620
- name: application-values.yaml-postgresql
621-
image: docker.io/bitnami/postgresql:11.14.0-debian-10-r22
621+
image: docker.io/bitnamilegacy/postgresql:11.14.0-debian-10-r22
622622
imagePullPolicy: "IfNotPresent"
623623
resources:
624624
limits:
@@ -692,17 +692,17 @@ spec:
692692
readinessProbe:
693693
exec:
694694
command:
695-
- /bin/sh
696-
- -c
697-
- -e
698-
- |
699-
exec pg_isready -U "sonarUser" -d "dbname=sonarDB" -h 127.0.0.1 -p 5432
700-
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
695+
- /bin/sh
696+
- -c
697+
- -e
698+
- |
699+
exec pg_isready -U "sonarUser" -d "dbname=sonarDB" -h 127.0.0.1 -p 5432
700+
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
701+
failureThreshold: 6
701702
initialDelaySeconds: 5
702703
periodSeconds: 10
703-
timeoutSeconds: 5
704704
successThreshold: 1
705-
failureThreshold: 6
705+
timeoutSeconds: 5
706706
volumeMounts:
707707
- name: dshm
708708
mountPath: /dev/shm

‎tests/unit-compatibility-test/fixtures/sonarqube-dce/ca-certificates-configmap.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ spec:
707707
automountServiceAccountToken: false
708708
containers:
709709
- name: ca-certificates-configmap.yaml-postgresql
710-
image: docker.io/bitnami/postgresql:11.14.0-debian-10-r22
710+
image: docker.io/bitnamilegacy/postgresql:11.14.0-debian-10-r22
711711
imagePullPolicy: "IfNotPresent"
712712
resources:
713713
limits:
@@ -781,17 +781,17 @@ spec:
781781
readinessProbe:
782782
exec:
783783
command:
784-
- /bin/sh
785-
- -c
786-
- -e
787-
- |
788-
exec pg_isready -U "sonarUser" -d "dbname=sonarDB" -h 127.0.0.1 -p 5432
789-
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
784+
- /bin/sh
785+
- -c
786+
- -e
787+
- |
788+
exec pg_isready -U "sonarUser" -d "dbname=sonarDB" -h 127.0.0.1 -p 5432
789+
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
790+
failureThreshold: 6
790791
initialDelaySeconds: 5
791792
periodSeconds: 10
792-
timeoutSeconds: 5
793793
successThreshold: 1
794-
failureThreshold: 6
794+
timeoutSeconds: 5
795795
volumeMounts:
796796
- name: dshm
797797
mountPath: /dev/shm

‎tests/unit-compatibility-test/fixtures/sonarqube-dce/ca-certificates-secret.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ spec:
646646
automountServiceAccountToken: false
647647
containers:
648648
- name: ca-certificates-secret.yaml-postgresql
649-
image: docker.io/bitnami/postgresql:11.14.0-debian-10-r22
649+
image: docker.io/bitnamilegacy/postgresql:11.14.0-debian-10-r22
650650
imagePullPolicy: "IfNotPresent"
651651
resources:
652652
limits:
@@ -720,17 +720,17 @@ spec:
720720
readinessProbe:
721721
exec:
722722
command:
723-
- /bin/sh
724-
- -c
725-
- -e
726-
- |
727-
exec pg_isready -U "sonarUser" -d "dbname=sonarDB" -h 127.0.0.1 -p 5432
728-
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
723+
- /bin/sh
724+
- -c
725+
- -e
726+
- |
727+
exec pg_isready -U "sonarUser" -d "dbname=sonarDB" -h 127.0.0.1 -p 5432
728+
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
729+
failureThreshold: 6
729730
initialDelaySeconds: 5
730731
periodSeconds: 10
731-
timeoutSeconds: 5
732732
successThreshold: 1
733-
failureThreshold: 6
733+
timeoutSeconds: 5
734734
volumeMounts:
735735
- name: dshm
736736
mountPath: /dev/shm

‎tests/unit-compatibility-test/fixtures/sonarqube-dce/change-admin-password-hook-values.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ spec:
632632
automountServiceAccountToken: false
633633
containers:
634634
- name: change-admin-password-hook-values.yaml-postgresql
635-
image: docker.io/bitnami/postgresql:11.14.0-debian-10-r22
635+
image: docker.io/bitnamilegacy/postgresql:11.14.0-debian-10-r22
636636
imagePullPolicy: "IfNotPresent"
637637
resources:
638638
limits:
@@ -706,17 +706,17 @@ spec:
706706
readinessProbe:
707707
exec:
708708
command:
709-
- /bin/sh
710-
- -c
711-
- -e
712-
- |
713-
exec pg_isready -U "sonarUser" -d "dbname=sonarDB" -h 127.0.0.1 -p 5432
714-
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
709+
- /bin/sh
710+
- -c
711+
- -e
712+
- |
713+
exec pg_isready -U "sonarUser" -d "dbname=sonarDB" -h 127.0.0.1 -p 5432
714+
[ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
715+
failureThreshold: 6
715716
initialDelaySeconds: 5
716717
periodSeconds: 10
717-
timeoutSeconds: 5
718718
successThreshold: 1
719-
failureThreshold: 6
719+
timeoutSeconds: 5
720720
volumeMounts:
721721
- name: dshm
722722
mountPath: /dev/shm

0 commit comments

Comments
 (0)