Skip to content

Commit 96fd413

Browse files
authored
Chart: Update postgres subchart to 10.5.3 (apache#17041)
We were on 6.3.12 and the current latest version is 10.5.3. We have dropped support for Helm 2 already so Helm 3 users won't be affected. Secondly this postgres should only used for development, not production.
1 parent eb3d685 commit 96fd413

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

chart/Chart.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: postgresql
33
repository: https://charts.bitnami.com/bitnami
4-
version: 6.3.12
5-
digest: sha256:9c524b20b23abd5ec3a6e264dbf2bd2e2d50fb5a553d7c1d79f88efa0dc69cb9
6-
generated: "2021-03-02T18:40:05.677618583-05:00"
4+
version: 10.5.3
5+
digest: sha256:d8ba564b767cbf73a4ca87cb3b97e0a75bc813ba0a58a1b0bd6c7154a608e783
6+
generated: "2021-07-20T23:05:18.37915+01:00"

chart/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ keywords:
3434
- scheduler
3535
dependencies:
3636
- name: postgresql
37-
version: 6.3.12
37+
version: 10.5.3
3838
repository: "https://charts.bitnami.com/bitnami"
3939
condition: postgresql.enabled
4040
maintainers:

chart/tests/helm_template_generator.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ def create_validator(api_version, kind):
7575

7676
def validate_k8s_object(instance):
7777
# Skip PostgresSQL chart
78-
chart = jmespath.search("metadata.labels.chart", instance)
78+
labels = jmespath.search("metadata.labels", instance)
79+
if "helm.sh/chart" in labels:
80+
chart = labels["helm.sh/chart"]
81+
else:
82+
chart = labels.get("chart")
83+
7984
if chart and 'postgresql' in chart:
8085
return
8186

chart/tests/test_basic_helm_chart.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@ def test_basic_deployments(self):
8383
assert OBJECT_COUNT_IN_BASIC_DEPLOYMENT == len(k8s_objects)
8484
for k8s_object in k8s_objects:
8585
labels = jmespath.search('metadata.labels', k8s_object) or {}
86-
if 'postgresql' in labels.get('chart'):
86+
if 'helm.sh/chart' in labels:
87+
chart_name = labels.get('helm.sh/chart')
88+
else:
89+
chart_name = labels.get('chart')
90+
if chart_name and 'postgresql' in chart_name:
8791
continue
8892
k8s_name = k8s_object['kind'] + ":" + k8s_object['metadata']['name']
8993
assert 'TEST-VALUE' == labels.get(

0 commit comments

Comments
 (0)