Skip to content

Commit cb4e8c0

Browse files
mikhail-klimkomikhail-klimko
authored
feat(cf-common): add trafficDistribution for services (#109)
1 parent abaa762 commit cb4e8c0

45 files changed

Lines changed: 326 additions & 321 deletions

Some content is hidden

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

‎charts/cf-common/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: v0.0.0
33
description: Codefresh library chart
44
name: cf-common
5-
version: 0.27.0
5+
version: 0.28.0
66
type: library
77
keywords:
88
- codefresh

‎charts/cf-common/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Codefresh library chart
44

5-
![Version: 0.27.0](https://img.shields.io/badge/Version-0.27.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
5+
![Version: 0.28.0](https://img.shields.io/badge/Version-0.28.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
66

77
## Installing the Chart
88

@@ -18,7 +18,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
1818
# Chart.yaml
1919
dependencies:
2020
- name: cf-common
21-
version: 0.27.0
21+
version: 0.28.0
2222
repository: https://chartmuseum.codefresh.io/cf-common
2323
```
2424

‎charts/cf-common/templates/classic/_env_var_secret_ref.tpl‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{{- /*
22
MONGODB_HOST env var secret name
33
*/}}
4-
{{- define "cf-common-0.27.0.classic.mongodb-host-env-var-secret-name" }}
4+
{{- define "cf-common-0.28.0.classic.mongodb-host-env-var-secret-name" }}
55
{{- if or .Values.mongodbHostSecretKeyRef .Values.global.mongodbHostSecretKeyRef }}
66
{{- printf (coalesce .Values.mongodbHostSecretKeyRef.name .Values.global.mongodbHostSecretKeyRef.name) }}
77
{{- else }}
8-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
8+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
99
{{- end }}
1010
{{- end }}
1111

1212
{{- /*
1313
MONGODB_HOST env var secret key
1414
*/}}
15-
{{- define "cf-common-0.27.0.classic.mongodb-host-env-var-secret-key" }}
15+
{{- define "cf-common-0.28.0.classic.mongodb-host-env-var-secret-key" }}
1616
{{- if or .Values.mongodbHostSecretKeyRef .Values.global.mongodbHostSecretKeyRef }}
1717
{{- printf (coalesce .Values.mongodbHostSecretKeyRef.key .Values.global.mongodbHostSecretKeyRef.key) }}
1818
{{- else }}
@@ -23,18 +23,18 @@ MONGODB_HOST env var secret key
2323
{{- /*
2424
MONGODB_USER env var secret name
2525
*/}}
26-
{{- define "cf-common-0.27.0.classic.mongodb-user-env-var-secret-name" }}
26+
{{- define "cf-common-0.28.0.classic.mongodb-user-env-var-secret-name" }}
2727
{{- if or .Values.mongodbUserSecretKeyRef .Values.global.mongodbUserSecretKeyRef }}
2828
{{- printf (coalesce .Values.mongodbUserSecretKeyRef.name .Values.global.mongodbUserSecretKeyRef.name) }}
2929
{{- else }}
30-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
30+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
3131
{{- end }}
3232
{{- end }}
3333

3434
{{- /*
3535
MONGODB_USER env var secret key
3636
*/}}
37-
{{- define "cf-common-0.27.0.classic.mongodb-user-env-var-secret-key" }}
37+
{{- define "cf-common-0.28.0.classic.mongodb-user-env-var-secret-key" }}
3838
{{- if or .Values.mongodbUserSecretKeyRef .Values.global.mongodbUserSecretKeyRef }}
3939
{{- printf (coalesce .Values.mongodbUserSecretKeyRef.key .Values.global.mongodbUserSecretKeyRef.key) }}
4040
{{- else }}
@@ -45,18 +45,18 @@ MONGODB_USER env var secret key
4545
{{- /*
4646
MONGODB_PASSWORD env var secret name
4747
*/}}
48-
{{- define "cf-common-0.27.0.classic.mongodb-password-env-var-secret-name" }}
48+
{{- define "cf-common-0.28.0.classic.mongodb-password-env-var-secret-name" }}
4949
{{- if or .Values.mongodbPasswordSecretKeyRef .Values.global.mongodbPasswordSecretKeyRef }}
5050
{{- printf (coalesce .Values.mongodbPasswordSecretKeyRef.name .Values.global.mongodbPasswordSecretKeyRef.name) }}
5151
{{- else }}
52-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
52+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
5353
{{- end }}
5454
{{- end }}
5555

5656
{{- /*
5757
MONGODB_PASSWORD env var secret key
5858
*/}}
59-
{{- define "cf-common-0.27.0.classic.mongodb-password-env-var-secret-key" }}
59+
{{- define "cf-common-0.28.0.classic.mongodb-password-env-var-secret-key" }}
6060
{{- if or .Values.mongodbPasswordSecretKeyRef .Values.global.mongodbPasswordSecretKeyRef }}
6161
{{- printf (coalesce .Values.mongodbPasswordSecretKeyRef.key .Values.global.mongodbPasswordSecretKeyRef.key) }}
6262
{{- else }}
@@ -67,7 +67,7 @@ MONGODB_PASSWORD env var secret key
6767
{{- /*
6868
MONGO_URI env var value
6969
*/}}
70-
{{- define "cf-common-0.27.0.classic.mongo-uri-env-var-value" }}
70+
{{- define "cf-common-0.28.0.classic.mongo-uri-env-var-value" }}
7171
{{- /*
7272
Check for legacy global.mongoURI
7373
*/}}
@@ -84,7 +84,7 @@ New secret implementation
8484
{{- /*
8585
MONGO_URI_ARCHIVE env var value
8686
*/}}
87-
{{- define "cf-common-0.27.0.classic.mongo-uri-archive-env-var-value" }}
87+
{{- define "cf-common-0.28.0.classic.mongo-uri-archive-env-var-value" }}
8888
{{- /*
8989
Check for legacy global.mongoURIArchive or global.mongoURI
9090
*/}}
@@ -102,18 +102,18 @@ New secret implementation
102102
{{- /*
103103
REDIS_URL env var secret name
104104
*/}}
105-
{{- define "cf-common-0.27.0.classic.redis-url-env-var-secret-name" }}
105+
{{- define "cf-common-0.28.0.classic.redis-url-env-var-secret-name" }}
106106
{{- if or .Values.redisUrlSecretKeyRef .Values.global.redisUrlSecretKeyRef }}
107107
{{- printf (coalesce .Values.redisUrlSecretKeyRef.name .Values.global.redisUrlSecretKeyRef.name) }}
108108
{{- else }}
109-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
109+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
110110
{{- end }}
111111
{{- end }}
112112

113113
{{- /*
114114
REDIS_URL env var secret key
115115
*/}}
116-
{{- define "cf-common-0.27.0.classic.redis-url-env-var-secret-key" }}
116+
{{- define "cf-common-0.28.0.classic.redis-url-env-var-secret-key" }}
117117
{{- if or .Values.redisUrlSecretKeyRef .Values.global.redisUrlSecretKeyRef }}
118118
{{- printf (coalesce .Values.redisUrlSecretKeyRef.key .Values.global.redisUrlSecretKeyRef.key) }}
119119
{{- else }}
@@ -124,18 +124,18 @@ REDIS_URL env var secret key
124124
{{- /*
125125
REDIS_PASSWORD env var secret name
126126
*/}}
127-
{{- define "cf-common-0.27.0.classic.redis-password-env-var-secret-name" }}
127+
{{- define "cf-common-0.28.0.classic.redis-password-env-var-secret-name" }}
128128
{{- if or .Values.redisPasswordSecretKeyRef .Values.global.redisPasswordSecretKeyRef }}
129129
{{- printf (coalesce .Values.redisPasswordSecretKeyRef.name .Values.global.redisPasswordSecretKeyRef.name) }}
130130
{{- else }}
131-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
131+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
132132
{{- end }}
133133
{{- end }}
134134

135135
{{- /*
136136
REDIS_PASSWORD env var secret key
137137
*/}}
138-
{{- define "cf-common-0.27.0.classic.redis-password-env-var-secret-key" }}
138+
{{- define "cf-common-0.28.0.classic.redis-password-env-var-secret-key" }}
139139
{{- if or .Values.redisPasswordSecretKeyRef .Values.global.redisPasswordSecretKeyRef }}
140140
{{- printf (coalesce .Values.redisPasswordSecretKeyRef.key .Values.global.redisPasswordSecretKeyRef.key) }}
141141
{{- else }}
@@ -146,18 +146,18 @@ REDIS_PASSWORD env var secret key
146146
{{- /*
147147
POSTGRES_HOSTNAME env var secret name
148148
*/}}
149-
{{- define "cf-common-0.27.0.classic.postgres-hostname-env-var-secret-name" }}
149+
{{- define "cf-common-0.28.0.classic.postgres-hostname-env-var-secret-name" }}
150150
{{- if or .Values.postgresHostnameSecretKeyRef .Values.global.postgresHostnameSecretKeyRef }}
151151
{{- printf (coalesce .Values.postgresHostnameSecretKeyRef.name .Values.global.postgresHostnameSecretKeyRef.name) }}
152152
{{- else }}
153-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
153+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
154154
{{- end }}
155155
{{- end }}
156156

157157
{{- /*
158158
POSTGRES_HOSTNAME env var secret key
159159
*/}}
160-
{{- define "cf-common-0.27.0.classic.postgres-hostname-env-var-secret-key" }}
160+
{{- define "cf-common-0.28.0.classic.postgres-hostname-env-var-secret-key" }}
161161
{{- if or .Values.postgresHostnameSecretKeyRef .Values.global.postgresHostnameSecretKeyRef }}
162162
{{- printf (coalesce .Values.postgresHostnameSecretKeyRef.key .Values.global.postgresHostnameSecretKeyRef.key) }}
163163
{{- else }}
@@ -168,18 +168,18 @@ POSTGRES_HOSTNAME env var secret key
168168
{{- /*
169169
POSTGRES_PASSWORD env var secret name
170170
*/}}
171-
{{- define "cf-common-0.27.0.classic.postgres-password-env-var-secret-name" }}
171+
{{- define "cf-common-0.28.0.classic.postgres-password-env-var-secret-name" }}
172172
{{- if or .Values.postgresPasswordSecretKeyRef .Values.global.postgresPasswordSecretKeyRef }}
173173
{{- printf (coalesce .Values.postgresPasswordSecretKeyRef.name .Values.global.postgresPasswordSecretKeyRef.name) }}
174174
{{- else }}
175-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
175+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
176176
{{- end }}
177177
{{- end }}
178178

179179
{{- /*
180180
POSTGRES_PASSWORD env var secret key
181181
*/}}
182-
{{- define "cf-common-0.27.0.classic.postgres-password-env-var-secret-key" }}
182+
{{- define "cf-common-0.28.0.classic.postgres-password-env-var-secret-key" }}
183183
{{- if or .Values.postgresPasswordSecretKeyRef .Values.global.postgresPasswordSecretKeyRef }}
184184
{{- printf (coalesce .Values.postgresPasswordSecretKeyRef.key .Values.global.postgresPasswordSecretKeyRef.key) }}
185185
{{- else }}
@@ -190,18 +190,18 @@ POSTGRES_PASSWORD env var secret key
190190
{{- /*
191191
POSTGRES_USER env var secret name
192192
*/}}
193-
{{- define "cf-common-0.27.0.classic.postgres-user-env-var-secret-name" }}
193+
{{- define "cf-common-0.28.0.classic.postgres-user-env-var-secret-name" }}
194194
{{- if or .Values.postgresUserSecretKeyRef .Values.global.postgresUserSecretKeyRef }}
195195
{{- printf (coalesce .Values.postgresUserSecretKeyRef.name .Values.global.postgresUserSecretKeyRef.name) }}
196196
{{- else }}
197-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
197+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
198198
{{- end }}
199199
{{- end }}
200200

201201
{{- /*
202202
POSTGRES_USER env var secret key
203203
*/}}
204-
{{- define "cf-common-0.27.0.classic.postgres-user-env-var-secret-key" }}
204+
{{- define "cf-common-0.28.0.classic.postgres-user-env-var-secret-key" }}
205205
{{- if or .Values.postgresUserSecretKeyRef .Values.global.postgresUserSecretKeyRef }}
206206
{{- printf (coalesce .Values.postgresUserSecretKeyRef.key .Values.global.postgresUserSecretKeyRef.key) }}
207207
{{- else }}
@@ -212,18 +212,18 @@ POSTGRES_USER env var secret key
212212
{{- /*
213213
RABBITMQ_HOSTNAME env var secret name
214214
*/}}
215-
{{- define "cf-common-0.27.0.classic.rabbitmq-hostname-env-var-secret-name" }}
215+
{{- define "cf-common-0.28.0.classic.rabbitmq-hostname-env-var-secret-name" }}
216216
{{- if or .Values.rabbitmqHostnameSecretKeyRef .Values.global.rabbitmqHostnameSecretKeyRef }}
217217
{{- printf (coalesce .Values.rabbitmqHostnameSecretKeyRef.name .Values.global.rabbitmqHostnameSecretKeyRef.name) }}
218218
{{- else }}
219-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
219+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
220220
{{- end }}
221221
{{- end }}
222222

223223
{{- /*
224224
RABBITMQ_HOSTNAME env var secret key
225225
*/}}
226-
{{- define "cf-common-0.27.0.classic.rabbitmq-hostname-env-var-secret-key" }}
226+
{{- define "cf-common-0.28.0.classic.rabbitmq-hostname-env-var-secret-key" }}
227227
{{- if or .Values.rabbitmqHostnameSecretKeyRef .Values.global.rabbitmqHostnameSecretKeyRef }}
228228
{{- printf (coalesce .Values.rabbitmqHostnameSecretKeyRef.key .Values.global.rabbitmqHostnameSecretKeyRef.key) }}
229229
{{- else }}
@@ -234,18 +234,18 @@ RABBITMQ_HOSTNAME env var secret key
234234
{{- /*
235235
RABBITMQ_PASSWORD env var secret name
236236
*/}}
237-
{{- define "cf-common-0.27.0.classic.rabbitmq-password-env-var-secret-name" }}
237+
{{- define "cf-common-0.28.0.classic.rabbitmq-password-env-var-secret-name" }}
238238
{{- if or .Values.rabbitmqPasswordSecretKeyRef .Values.global.rabbitmqPasswordSecretKeyRef }}
239239
{{- printf (coalesce .Values.rabbitmqPasswordSecretKeyRef.name .Values.global.rabbitmqPasswordSecretKeyRef.name) }}
240240
{{- else }}
241-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
241+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
242242
{{- end }}
243243
{{- end }}
244244

245245
{{- /*
246246
RABBITMQ_PASSWORD env var secret key
247247
*/}}
248-
{{- define "cf-common-0.27.0.classic.rabbitmq-password-env-var-secret-key" }}
248+
{{- define "cf-common-0.28.0.classic.rabbitmq-password-env-var-secret-key" }}
249249
{{- if or .Values.rabbitmqPasswordSecretKeyRef .Values.global.rabbitmqPasswordSecretKeyRef }}
250250
{{- printf (coalesce .Values.rabbitmqPasswordSecretKeyRef.key .Values.global.rabbitmqPasswordSecretKeyRef.key) }}
251251
{{- else }}
@@ -256,18 +256,18 @@ RABBITMQ_PASSWORD env var secret key
256256
{{- /*
257257
RABBITMQ_USERNAME env var secret name
258258
*/}}
259-
{{- define "cf-common-0.27.0.classic.rabbitmq-username-env-var-secret-name" }}
259+
{{- define "cf-common-0.28.0.classic.rabbitmq-username-env-var-secret-name" }}
260260
{{- if or .Values.rabbitmqUsernameSecretKeyRef .Values.global.rabbitmqUsernameSecretKeyRef }}
261261
{{- printf (coalesce .Values.rabbitmqUsernameSecretKeyRef.name .Values.global.rabbitmqUsernameSecretKeyRef.name) }}
262262
{{- else }}
263-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
263+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
264264
{{- end }}
265265
{{- end }}
266266

267267
{{- /*
268268
RABBITMQ_USERNAME env var secret key
269269
*/}}
270-
{{- define "cf-common-0.27.0.classic.rabbitmq-username-env-var-secret-key" }}
270+
{{- define "cf-common-0.28.0.classic.rabbitmq-username-env-var-secret-key" }}
271271
{{- if or .Values.rabbitmqUsernameSecretKeyRef .Values.global.rabbitmqUsernameSecretKeyRef }}
272272
{{- printf (coalesce .Values.rabbitmqUsernameSecretKeyRef.key .Values.global.rabbitmqUsernameSecretKeyRef.key) }}
273273
{{- else }}
@@ -278,18 +278,18 @@ RABBITMQ_USERNAME env var secret key
278278
{{- /*
279279
FIREBASE_SECRET env var secret name
280280
*/}}
281-
{{- define "cf-common-0.27.0.classic.firebase-secret-env-var-secret-name" }}
281+
{{- define "cf-common-0.28.0.classic.firebase-secret-env-var-secret-name" }}
282282
{{- if or .Values.firebaseSecretSecretKeyRef .Values.global.firebaseSecretSecretKeyRef }}
283283
{{- printf (coalesce .Values.firebaseSecretSecretKeyRef.name .Values.global.firebaseSecretSecretKeyRef.name) }}
284284
{{- else }}
285-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
285+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
286286
{{- end }}
287287
{{- end }}
288288

289289
{{- /*
290290
FIREBASE_SECRET env var secret key
291291
*/}}
292-
{{- define "cf-common-0.27.0.classic.firebase-secret-env-var-secret-key" }}
292+
{{- define "cf-common-0.28.0.classic.firebase-secret-env-var-secret-key" }}
293293
{{- if or .Values.firebaseSecretSecretKeyRef .Values.global.firebaseSecretSecretKeyRef }}
294294
{{- printf (coalesce .Values.firebaseSecretSecretKeyRef.key .Values.global.firebaseSecretSecretKeyRef.key) }}
295295
{{- else }}
@@ -300,18 +300,18 @@ FIREBASE_SECRET env var secret key
300300
{{- /*
301301
FIREBASE_URL env var secret name
302302
*/}}
303-
{{- define "cf-common-0.27.0.classic.firebase-url-env-var-secret-name" }}
303+
{{- define "cf-common-0.28.0.classic.firebase-url-env-var-secret-name" }}
304304
{{- if or .Values.firebaseUrlSecretKeyRef .Values.global.firebaseUrlSecretKeyRef }}
305305
{{- printf (coalesce .Values.firebaseUrlSecretKeyRef.name .Values.global.firebaseUrlSecretKeyRef.name) }}
306306
{{- else }}
307-
{{- printf "%s-%s" (include "cf-common-0.27.0.names.fullname" .) "secret" }}
307+
{{- printf "%s-%s" (include "cf-common-0.28.0.names.fullname" .) "secret" }}
308308
{{- end }}
309309
{{- end }}
310310

311311
{{- /*
312312
FIREBASE_URL env var secret key
313313
*/}}
314-
{{- define "cf-common-0.27.0.classic.firebase-url-env-var-secret-key" }}
314+
{{- define "cf-common-0.28.0.classic.firebase-url-env-var-secret-key" }}
315315
{{- if or .Values.firebaseUrlSecretKeyRef .Values.global.firebaseUrlSecretKeyRef }}
316316
{{- printf (coalesce .Values.firebaseUrlSecretKeyRef.key .Values.global.firebaseUrlSecretKeyRef.key) }}
317317
{{- else }}

‎charts/cf-common/templates/classic/_helpers.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
Calculate RabbitMQ URI (for On-Prem)
33
Must me called from chart root context.
44
Usage:
5-
{{ include "cf-common-0.27.0.classic.calculateRabbitMqUri" . }}
5+
{{ include "cf-common-0.28.0.classic.calculateRabbitMqUri" . }}
66
*/}}
77

8-
{{- define "cf-common-0.27.0.classic.calculateRabbitMqUri" }}
8+
{{- define "cf-common-0.28.0.classic.calculateRabbitMqUri" }}
99

1010
{{- $rabbitmqProtocol := .Values.global.rabbitmqProtocol | default "amqp" -}}
1111
{{- $rabbitmqUsername := .Values.global.rabbitmqUsername -}}
@@ -23,9 +23,9 @@ coalesce here for backward compatibility
2323
{{/*
2424
Calculate Mongo Uri (for On-Prem)
2525
Usage:
26-
{{ include "cf.common-0.27.0.classic.calculateMongoUri" (dict "dbName" $.Values.global.pipelineManagerService "mongoURI" $.Values.global.mongoURI) }}
26+
{{ include "cf.common-0.28.0.classic.calculateMongoUri" (dict "dbName" $.Values.global.pipelineManagerService "mongoURI" $.Values.global.mongoURI) }}
2727
*/}}
28-
{{- define "cf-common-0.27.0.classic.calculateMongoUri" -}}
28+
{{- define "cf-common-0.28.0.classic.calculateMongoUri" -}}
2929
{{- if contains "?" .mongoURI -}}
3030
{{- $mongoURI := (splitList "?" .mongoURI) -}}
3131
{{- printf "%s%s?%s" (first $mongoURI) .dbName (last $mongoURI) }}
@@ -39,7 +39,7 @@ Usage:
3939
{{/*
4040
Calculate Consul host Uri (for On-Prem)
4141
*/}}
42-
{{- define "cf-common-0.27.0.classic.calculateConsulUri" }}
42+
{{- define "cf-common-0.28.0.classic.calculateConsulUri" }}
4343
{{- if .Values.global.consulHost }}
4444
{{- printf "http://%s:%v" .Values.global.consulHost .Values.global.consulHttpPort -}}
4545
{{- else }}

‎charts/cf-common/templates/common/_annotations.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
Render checksum annotation
33
Must be called from chart root context.
44
Usage:
5-
annotations: {{ include "cf-common-0.27.0.annotations.podAnnotations" . | nindent }}
5+
annotations: {{ include "cf-common-0.28.0.annotations.podAnnotations" . | nindent }}
66
*/}}
7-
{{- define "cf-common-0.27.0.annotations.podAnnotations" -}}
7+
{{- define "cf-common-0.28.0.annotations.podAnnotations" -}}
88

99
{{- if .Values.podAnnotations -}}
10-
{{- include "cf-common-0.27.0.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 0 }}
10+
{{- include "cf-common-0.28.0.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 0 }}
1111
{{- end -}}
1212

1313
{{- $configMapFound := dict -}}
1414
{{- range $configMapIndex, $configMapItem := .Values.configMaps -}}
1515

1616
{{- if $configMapItem.enabled -}}
17-
{{- $_ := set $configMapFound $configMapIndex ( include "cf-common-0.27.0.tplrender" (dict "Values" $configMapItem.data "context" $) | sha256sum) -}}
17+
{{- $_ := set $configMapFound $configMapIndex ( include "cf-common-0.28.0.tplrender" (dict "Values" $configMapItem.data "context" $) | sha256sum) -}}
1818
{{- end -}}
1919

2020
{{- if $configMapFound -}}
@@ -27,7 +27,7 @@ annotations: {{ include "cf-common-0.27.0.annotations.podAnnotations" . | ninden
2727
{{- range $secretIndex, $secretItem := .Values.secrets -}}
2828

2929
{{- if $secretItem.enabled -}}
30-
{{- $_ := set $secretFound $secretIndex ( include "cf-common-0.27.0.tplrender" (dict "Values" $secretItem.stringData "context" $) | sha256sum) -}}
30+
{{- $_ := set $secretFound $secretIndex ( include "cf-common-0.28.0.tplrender" (dict "Values" $secretItem.stringData "context" $) | sha256sum) -}}
3131
{{- end -}}
3232

3333
{{- if $secretFound -}}

0 commit comments

Comments
 (0)