Skip to content

Commit 7ecb246

Browse files
committed
update helm chart dependency for common for redis
1 parent baccc46 commit 7ecb246

30 files changed

Lines changed: 2896 additions & 13 deletions

charts/ches/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: common-hosted-email-service
33
# This is the chart version. This version number should be incremented each time you make changes
44
# to the chart and its templates, including the app version.
55
# Versions are expected to follow Semantic Versioning (https://semver.org/)
6-
version: 1.1.2
6+
version: 1.1.8
77
kubeVersion: ">= 1.13.0"
88
description: An API for sending emails with scheduling and mail merge features
99
# A chart can be either an 'application' or a 'library' chart.
@@ -26,13 +26,13 @@ sources:
2626
- https://github.com/bcgov/common-hosted-email-service
2727
dependencies:
2828
- name: postgrescluster
29-
version: 2.0.5
29+
version: 2.0.9
3030
repository: "file://../postgres"
3131
condition: postgres.enabled
3232
alias: postgres
3333
- name: redis
3434
condition: redis.enabled
35-
version: 23.0.5
35+
version: 24.0.6
3636
repository: "file://../redis"
3737
alias: redis
3838
maintainers:

charts/postgres/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ name: postgrescluster
33
description: A Helm chart for Kubernetes
44
type: application
55
# postgrescluster Helm Chart version
6-
version: 2.0.5
6+
version: 2.0.9
77
# PostgresCluster CRD version
88
appVersion: 5.5.1

charts/redis/Chart.lock

Lines changed: 0 additions & 6 deletions
This file was deleted.

charts/redis/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ apiVersion: v2
1919
appVersion: 8.2.1
2020
dependencies:
2121
- name: common
22-
repository: oci://registry-1.docker.io/bitnamicharts
22+
repository: "file://../bitnami-common"
2323
tags:
2424
- bitnami-common
25-
version: 2.x.x
25+
version: 2.31.7
2626
description: Redis(R) is an open source, advanced key-value store. It is often referred
2727
to as a data structure server since keys can contain strings, hashes, lists, sets
2828
and sorted sets.
@@ -38,4 +38,4 @@ maintainers:
3838
name: redis
3939
sources:
4040
- https://github.com/bitnami/charts/tree/main/bitnami/redis
41-
version: 23.0.5
41+
version: 24.0.6
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Patterns to ignore when building packages.
2+
# This supports shell glob matching, relative path matching, and
3+
# negation (prefixed with !). Only one pattern per line.
4+
.DS_Store
5+
# Common VCS dirs
6+
.git/
7+
.gitignore
8+
.bzr/
9+
.bzrignore
10+
.hg/
11+
.hgignore
12+
.svn/
13+
# Common backup files
14+
*.swp
15+
*.bak
16+
*.tmp
17+
*~
18+
# Various IDEs
19+
.project
20+
.idea/
21+
*.tmproj
22+
.vscode/
23+
# img folder
24+
img/
25+
# Changelog
26+
CHANGELOG.md

charts/redis/charts/bitnami-common/CHANGELOG.md

Lines changed: 682 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Copyright Broadcom, Inc. All Rights Reserved.
2+
# SPDX-License-Identifier: APACHE-2.0
3+
4+
annotations:
5+
licenses: Apache-2.0
6+
apiVersion: v2
7+
# Please make sure that version and appVersion are always the same.
8+
appVersion: 2.31.7
9+
description: A Library Helm Chart for grouping common logic between bitnami charts. This chart is not deployable by itself.
10+
home: https://bitnami.com
11+
icon: https://dyltqmyl993wv.cloudfront.net/downloads/logos/bitnami-mark.png
12+
keywords:
13+
- common
14+
- helper
15+
- template
16+
- function
17+
- bitnami
18+
maintainers:
19+
- name: Broadcom, Inc. All Rights Reserved.
20+
url: https://github.com/bitnami/charts
21+
name: common
22+
sources:
23+
- https://github.com/bitnami/charts/tree/main/bitnami/common
24+
type: library
25+
version: 2.31.7

charts/redis/charts/bitnami-common/README.md

Lines changed: 391 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
{{/*
2+
Copyright Broadcom, Inc. All Rights Reserved.
3+
SPDX-License-Identifier: APACHE-2.0
4+
*/}}
5+
6+
{{/* vim: set filetype=mustache: */}}
7+
8+
{{/*
9+
Return a soft nodeAffinity definition
10+
{{ include "common.affinities.nodes.soft" (dict "key" "FOO" "values" (list "BAR" "BAZ")) -}}
11+
*/}}
12+
{{- define "common.affinities.nodes.soft" -}}
13+
preferredDuringSchedulingIgnoredDuringExecution:
14+
- preference:
15+
matchExpressions:
16+
- key: {{ .key }}
17+
operator: In
18+
values:
19+
{{- range .values }}
20+
- {{ . | quote }}
21+
{{- end }}
22+
weight: 1
23+
{{- end -}}
24+
25+
{{/*
26+
Return a hard nodeAffinity definition
27+
{{ include "common.affinities.nodes.hard" (dict "key" "FOO" "values" (list "BAR" "BAZ")) -}}
28+
*/}}
29+
{{- define "common.affinities.nodes.hard" -}}
30+
requiredDuringSchedulingIgnoredDuringExecution:
31+
nodeSelectorTerms:
32+
- matchExpressions:
33+
- key: {{ .key }}
34+
operator: In
35+
values:
36+
{{- range .values }}
37+
- {{ . | quote }}
38+
{{- end }}
39+
{{- end -}}
40+
41+
{{/*
42+
Return a nodeAffinity definition
43+
{{ include "common.affinities.nodes" (dict "type" "soft" "key" "FOO" "values" (list "BAR" "BAZ")) -}}
44+
*/}}
45+
{{- define "common.affinities.nodes" -}}
46+
{{- if eq .type "soft" }}
47+
{{- include "common.affinities.nodes.soft" . -}}
48+
{{- else if eq .type "hard" }}
49+
{{- include "common.affinities.nodes.hard" . -}}
50+
{{- end -}}
51+
{{- end -}}
52+
53+
{{/*
54+
Return a topologyKey definition
55+
{{ include "common.affinities.topologyKey" (dict "topologyKey" "BAR") -}}
56+
*/}}
57+
{{- define "common.affinities.topologyKey" -}}
58+
{{ .topologyKey | default "kubernetes.io/hostname" -}}
59+
{{- end -}}
60+
61+
{{/*
62+
Return a soft podAffinity/podAntiAffinity definition
63+
{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "extraNamespaces" (list "namespace1" "namespace2") "context" $) -}}
64+
*/}}
65+
{{- define "common.affinities.pods.soft" -}}
66+
{{- $component := default "" .component -}}
67+
{{- $customLabels := default (dict) .customLabels -}}
68+
{{- $extraMatchLabels := default (dict) .extraMatchLabels -}}
69+
{{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}}
70+
{{- $extraNamespaces := default (list) .extraNamespaces -}}
71+
preferredDuringSchedulingIgnoredDuringExecution:
72+
- podAffinityTerm:
73+
labelSelector:
74+
matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" .context )) | nindent 10 }}
75+
{{- if not (empty $component) }}
76+
{{ printf "app.kubernetes.io/component: %s" $component }}
77+
{{- end }}
78+
{{- range $key, $value := $extraMatchLabels }}
79+
{{ $key }}: {{ $value | quote }}
80+
{{- end }}
81+
{{- if $extraNamespaces }}
82+
namespaces:
83+
- {{ .context.Release.Namespace }}
84+
{{- with $extraNamespaces }}
85+
{{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
86+
{{- end }}
87+
{{- end }}
88+
topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
89+
weight: 1
90+
{{- range $extraPodAffinityTerms }}
91+
- podAffinityTerm:
92+
labelSelector:
93+
matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" $.context )) | nindent 10 }}
94+
{{- if not (empty $component) }}
95+
{{ printf "app.kubernetes.io/component: %s" $component }}
96+
{{- end }}
97+
{{- range $key, $value := .extraMatchLabels }}
98+
{{ $key }}: {{ $value | quote }}
99+
{{- end }}
100+
{{- if .namespaces }}
101+
namespaces:
102+
- {{ $.context.Release.Namespace }}
103+
{{- with .namespaces }}
104+
{{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
105+
{{- end }}
106+
{{- end }}
107+
topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
108+
weight: {{ .weight | default 1 -}}
109+
{{- end -}}
110+
{{- end -}}
111+
112+
{{/*
113+
Return a hard podAffinity/podAntiAffinity definition
114+
{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "extraNamespaces" (list "namespace1" "namespace2") "context" $) -}}
115+
*/}}
116+
{{- define "common.affinities.pods.hard" -}}
117+
{{- $component := default "" .component -}}
118+
{{- $customLabels := default (dict) .customLabels -}}
119+
{{- $extraMatchLabels := default (dict) .extraMatchLabels -}}
120+
{{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}}
121+
{{- $extraNamespaces := default (list) .extraNamespaces -}}
122+
requiredDuringSchedulingIgnoredDuringExecution:
123+
- labelSelector:
124+
matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" .context )) | nindent 8 }}
125+
{{- if not (empty $component) }}
126+
{{ printf "app.kubernetes.io/component: %s" $component }}
127+
{{- end }}
128+
{{- range $key, $value := $extraMatchLabels }}
129+
{{ $key }}: {{ $value | quote }}
130+
{{- end }}
131+
{{- if $extraNamespaces }}
132+
namespaces:
133+
- {{ .context.Release.Namespace }}
134+
{{- with $extraNamespaces }}
135+
{{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 6 }}
136+
{{- end }}
137+
{{- end }}
138+
topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
139+
{{- range $extraPodAffinityTerms }}
140+
- labelSelector:
141+
matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" $.context )) | nindent 8 }}
142+
{{- if not (empty $component) }}
143+
{{ printf "app.kubernetes.io/component: %s" $component }}
144+
{{- end }}
145+
{{- range $key, $value := .extraMatchLabels }}
146+
{{ $key }}: {{ $value | quote }}
147+
{{- end }}
148+
{{- if .namespaces }}
149+
namespaces:
150+
- {{ $.context.Release.Namespace }}
151+
{{- with .namespaces }}
152+
{{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 6 }}
153+
{{- end }}
154+
{{- end }}
155+
topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
156+
{{- end -}}
157+
{{- end -}}
158+
159+
{{/*
160+
Return a podAffinity/podAntiAffinity definition
161+
{{ include "common.affinities.pods" (dict "type" "soft" "key" "FOO" "values" (list "BAR" "BAZ")) -}}
162+
*/}}
163+
{{- define "common.affinities.pods" -}}
164+
{{- if eq .type "soft" }}
165+
{{- include "common.affinities.pods.soft" . -}}
166+
{{- else if eq .type "hard" }}
167+
{{- include "common.affinities.pods.hard" . -}}
168+
{{- end -}}
169+
{{- end -}}

0 commit comments

Comments
 (0)