Skip to content

Commit dc067d0

Browse files
mikhail-klimkomikhail-klimko
authored
feat(cf-common): extend external-secrets to allow dataFrom (#80)
1 parent 30609a6 commit dc067d0

Some content is hidden

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

44 files changed

+333
-295
lines changed

‎charts/cf-common-test/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Codefresh library chart - test chart - not for deployment!
2727
| configMaps | object | `{}` | |
2828
| container | object | `{}` | |
2929
| controller | object | `{}` | |
30+
| externalSecrets | list | `[]` | |
3031
| extraResources | list | `[]` | |
3132
| global | object | `{}` | |
3233
| hpa | object | `{}` | |

‎charts/cf-common-test/templates/external-secrets.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{{ $templateName := printf "cf-common-%s.external-secrets" (index .Subcharts "cf-common").Chart.Version }}
2+
{{- include $templateName . -}}

‎charts/cf-common-test/values.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,5 @@ initContainers: {}
3636
additionalContainers: []
3737

3838
extraResources: []
39+
40+
externalSecrets: []

‎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.18.1
5+
version: 0.18.2
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.18.1](https://img.shields.io/badge/Version-0.18.1-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.18.2](https://img.shields.io/badge/Version-0.18.2-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.18.1
21+
version: 0.18.2
2222
repository: https://chartmuseum.codefresh.io/cf-common
2323
```
2424

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

Lines changed: 58 additions & 40 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.18.1.classic.mongodb-host-env-var-secret-name" }}
4+
{{- define "cf-common-0.18.2.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.18.1.names.fullname" .) "secret" }}
8+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
99
{{- end }}
1010
{{- end }}
1111

1212
{{- /*
1313
MONGODB_HOST env var secret key
1414
*/}}
15-
{{- define "cf-common-0.18.1.classic.mongodb-host-env-var-secret-key" }}
15+
{{- define "cf-common-0.18.2.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.18.1.classic.mongodb-user-env-var-secret-name" }}
26+
{{- define "cf-common-0.18.2.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.18.1.names.fullname" .) "secret" }}
30+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
3131
{{- end }}
3232
{{- end }}
3333

3434
{{- /*
3535
MONGODB_USER env var secret key
3636
*/}}
37-
{{- define "cf-common-0.18.1.classic.mongodb-user-env-var-secret-key" }}
37+
{{- define "cf-common-0.18.2.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.18.1.classic.mongodb-password-env-var-secret-name" }}
48+
{{- define "cf-common-0.18.2.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.18.1.names.fullname" .) "secret" }}
52+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
5353
{{- end }}
5454
{{- end }}
5555

5656
{{- /*
5757
MONGODB_PASSWORD env var secret key
5858
*/}}
59-
{{- define "cf-common-0.18.1.classic.mongodb-password-env-var-secret-key" }}
59+
{{- define "cf-common-0.18.2.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.18.1.classic.mongo-uri-env-var-value" }}
70+
{{- define "cf-common-0.18.2.classic.mongo-uri-env-var-value" }}
7171
{{- /*
7272
Check for legacy global.mongoURI
7373
*/}}
@@ -81,21 +81,39 @@ New secret implementation
8181
{{- end }}
8282
{{- end }}
8383

84+
{{- /*
85+
MONGO_URI_ARCHIVE env var value
86+
*/}}
87+
{{- define "cf-common-0.18.2.classic.mongo-uri-archive-env-var-value" }}
88+
{{- /*
89+
Check for legacy global.mongoURIArchive or global.mongoURI
90+
*/}}
91+
{{- if or .Values.global.mongoURIArchive .Values.global.mongoURI }}
92+
{{- print "$(MONGO_URI_ARCHIVE)" }}
93+
{{- /*
94+
New secret implementation
95+
*/}}
96+
{{- else }}
97+
{{- print "$(MONGODB_PROTOCOL)://$(MONGODB_USER):$(MONGODB_PASSWORD)@$(MONGODB_HOST)/$(MONGODB_DATABASE_ARCHIVE)?$(MONGODB_OPTIONS)" }}
98+
{{- end }}
99+
{{- end }}
100+
101+
84102
{{- /*
85103
REDIS_URL env var secret name
86104
*/}}
87-
{{- define "cf-common-0.18.1.classic.redis-url-env-var-secret-name" }}
105+
{{- define "cf-common-0.18.2.classic.redis-url-env-var-secret-name" }}
88106
{{- if or .Values.redisUrlSecretKeyRef .Values.global.redisUrlSecretKeyRef }}
89107
{{- printf (coalesce .Values.redisUrlSecretKeyRef.name .Values.global.redisUrlSecretKeyRef.name) }}
90108
{{- else }}
91-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
109+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
92110
{{- end }}
93111
{{- end }}
94112

95113
{{- /*
96114
REDIS_URL env var secret key
97115
*/}}
98-
{{- define "cf-common-0.18.1.classic.redis-url-env-var-secret-key" }}
116+
{{- define "cf-common-0.18.2.classic.redis-url-env-var-secret-key" }}
99117
{{- if or .Values.redisUrlSecretKeyRef .Values.global.redisUrlSecretKeyRef }}
100118
{{- printf (coalesce .Values.redisUrlSecretKeyRef.key .Values.global.redisUrlSecretKeyRef.key) }}
101119
{{- else }}
@@ -106,18 +124,18 @@ REDIS_URL env var secret key
106124
{{- /*
107125
REDIS_PASSWORD env var secret name
108126
*/}}
109-
{{- define "cf-common-0.18.1.classic.redis-password-env-var-secret-name" }}
127+
{{- define "cf-common-0.18.2.classic.redis-password-env-var-secret-name" }}
110128
{{- if or .Values.redisPasswordSecretKeyRef .Values.global.redisPasswordSecretKeyRef }}
111129
{{- printf (coalesce .Values.redisPasswordSecretKeyRef.name .Values.global.redisPasswordSecretKeyRef.name) }}
112130
{{- else }}
113-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
131+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
114132
{{- end }}
115133
{{- end }}
116134

117135
{{- /*
118136
REDIS_PASSWORD env var secret key
119137
*/}}
120-
{{- define "cf-common-0.18.1.classic.redis-password-env-var-secret-key" }}
138+
{{- define "cf-common-0.18.2.classic.redis-password-env-var-secret-key" }}
121139
{{- if or .Values.redisPasswordSecretKeyRef .Values.global.redisPasswordSecretKeyRef }}
122140
{{- printf (coalesce .Values.redisPasswordSecretKeyRef.key .Values.global.redisPasswordSecretKeyRef.key) }}
123141
{{- else }}
@@ -128,18 +146,18 @@ REDIS_PASSWORD env var secret key
128146
{{- /*
129147
POSTGRES_HOSTNAME env var secret name
130148
*/}}
131-
{{- define "cf-common-0.18.1.classic.postgres-hostname-env-var-secret-name" }}
149+
{{- define "cf-common-0.18.2.classic.postgres-hostname-env-var-secret-name" }}
132150
{{- if or .Values.postgresHostnameSecretKeyRef .Values.global.postgresHostnameSecretKeyRef }}
133151
{{- printf (coalesce .Values.postgresHostnameSecretKeyRef.name .Values.global.postgresHostnameSecretKeyRef.name) }}
134152
{{- else }}
135-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
153+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
136154
{{- end }}
137155
{{- end }}
138156

139157
{{- /*
140158
POSTGRES_HOSTNAME env var secret key
141159
*/}}
142-
{{- define "cf-common-0.18.1.classic.postgres-hostname-env-var-secret-key" }}
160+
{{- define "cf-common-0.18.2.classic.postgres-hostname-env-var-secret-key" }}
143161
{{- if or .Values.postgresHostnameSecretKeyRef .Values.global.postgresHostnameSecretKeyRef }}
144162
{{- printf (coalesce .Values.postgresHostnameSecretKeyRef.key .Values.global.postgresHostnameSecretKeyRef.key) }}
145163
{{- else }}
@@ -150,18 +168,18 @@ POSTGRES_HOSTNAME env var secret key
150168
{{- /*
151169
POSTGRES_PASSWORD env var secret name
152170
*/}}
153-
{{- define "cf-common-0.18.1.classic.postgres-password-env-var-secret-name" }}
171+
{{- define "cf-common-0.18.2.classic.postgres-password-env-var-secret-name" }}
154172
{{- if or .Values.postgresPasswordSecretKeyRef .Values.global.postgresPasswordSecretKeyRef }}
155173
{{- printf (coalesce .Values.postgresPasswordSecretKeyRef.name .Values.global.postgresPasswordSecretKeyRef.name) }}
156174
{{- else }}
157-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
175+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
158176
{{- end }}
159177
{{- end }}
160178

161179
{{- /*
162180
POSTGRES_PASSWORD env var secret key
163181
*/}}
164-
{{- define "cf-common-0.18.1.classic.postgres-password-env-var-secret-key" }}
182+
{{- define "cf-common-0.18.2.classic.postgres-password-env-var-secret-key" }}
165183
{{- if or .Values.postgresPasswordSecretKeyRef .Values.global.postgresPasswordSecretKeyRef }}
166184
{{- printf (coalesce .Values.postgresPasswordSecretKeyRef.key .Values.global.postgresPasswordSecretKeyRef.key) }}
167185
{{- else }}
@@ -172,18 +190,18 @@ POSTGRES_PASSWORD env var secret key
172190
{{- /*
173191
POSTGRES_USER env var secret name
174192
*/}}
175-
{{- define "cf-common-0.18.1.classic.postgres-user-env-var-secret-name" }}
193+
{{- define "cf-common-0.18.2.classic.postgres-user-env-var-secret-name" }}
176194
{{- if or .Values.postgresUserSecretKeyRef .Values.global.postgresUserSecretKeyRef }}
177195
{{- printf (coalesce .Values.postgresUserSecretKeyRef.name .Values.global.postgresUserSecretKeyRef.name) }}
178196
{{- else }}
179-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
197+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
180198
{{- end }}
181199
{{- end }}
182200

183201
{{- /*
184202
POSTGRES_USER env var secret key
185203
*/}}
186-
{{- define "cf-common-0.18.1.classic.postgres-user-env-var-secret-key" }}
204+
{{- define "cf-common-0.18.2.classic.postgres-user-env-var-secret-key" }}
187205
{{- if or .Values.postgresUserSecretKeyRef .Values.global.postgresUserSecretKeyRef }}
188206
{{- printf (coalesce .Values.postgresUserSecretKeyRef.key .Values.global.postgresUserSecretKeyRef.key) }}
189207
{{- else }}
@@ -194,18 +212,18 @@ POSTGRES_USER env var secret key
194212
{{- /*
195213
RABBITMQ_HOSTNAME env var secret name
196214
*/}}
197-
{{- define "cf-common-0.18.1.classic.rabbitmq-hostname-env-var-secret-name" }}
215+
{{- define "cf-common-0.18.2.classic.rabbitmq-hostname-env-var-secret-name" }}
198216
{{- if or .Values.rabbitmqHostnameSecretKeyRef .Values.global.rabbitmqHostnameSecretKeyRef }}
199217
{{- printf (coalesce .Values.rabbitmqHostnameSecretKeyRef.name .Values.global.rabbitmqHostnameSecretKeyRef.name) }}
200218
{{- else }}
201-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
219+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
202220
{{- end }}
203221
{{- end }}
204222

205223
{{- /*
206224
RABBITMQ_HOSTNAME env var secret key
207225
*/}}
208-
{{- define "cf-common-0.18.1.classic.rabbitmq-hostname-env-var-secret-key" }}
226+
{{- define "cf-common-0.18.2.classic.rabbitmq-hostname-env-var-secret-key" }}
209227
{{- if or .Values.rabbitmqHostnameSecretKeyRef .Values.global.rabbitmqHostnameSecretKeyRef }}
210228
{{- printf (coalesce .Values.rabbitmqHostnameSecretKeyRef.key .Values.global.rabbitmqHostnameSecretKeyRef.key) }}
211229
{{- else }}
@@ -216,18 +234,18 @@ RABBITMQ_HOSTNAME env var secret key
216234
{{- /*
217235
RABBITMQ_PASSWORD env var secret name
218236
*/}}
219-
{{- define "cf-common-0.18.1.classic.rabbitmq-password-env-var-secret-name" }}
237+
{{- define "cf-common-0.18.2.classic.rabbitmq-password-env-var-secret-name" }}
220238
{{- if or .Values.rabbitmqPasswordSecretKeyRef .Values.global.rabbitmqPasswordSecretKeyRef }}
221239
{{- printf (coalesce .Values.rabbitmqPasswordSecretKeyRef.name .Values.global.rabbitmqPasswordSecretKeyRef.name) }}
222240
{{- else }}
223-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
241+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
224242
{{- end }}
225243
{{- end }}
226244

227245
{{- /*
228246
RABBITMQ_PASSWORD env var secret key
229247
*/}}
230-
{{- define "cf-common-0.18.1.classic.rabbitmq-password-env-var-secret-key" }}
248+
{{- define "cf-common-0.18.2.classic.rabbitmq-password-env-var-secret-key" }}
231249
{{- if or .Values.rabbitmqPasswordSecretKeyRef .Values.global.rabbitmqPasswordSecretKeyRef }}
232250
{{- printf (coalesce .Values.rabbitmqPasswordSecretKeyRef.key .Values.global.rabbitmqPasswordSecretKeyRef.key) }}
233251
{{- else }}
@@ -238,18 +256,18 @@ RABBITMQ_PASSWORD env var secret key
238256
{{- /*
239257
RABBITMQ_USERNAME env var secret name
240258
*/}}
241-
{{- define "cf-common-0.18.1.classic.rabbitmq-username-env-var-secret-name" }}
259+
{{- define "cf-common-0.18.2.classic.rabbitmq-username-env-var-secret-name" }}
242260
{{- if or .Values.rabbitmqUsernameSecretKeyRef .Values.global.rabbitmqUsernameSecretKeyRef }}
243261
{{- printf (coalesce .Values.rabbitmqUsernameSecretKeyRef.name .Values.global.rabbitmqUsernameSecretKeyRef.name) }}
244262
{{- else }}
245-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
263+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
246264
{{- end }}
247265
{{- end }}
248266

249267
{{- /*
250268
RABBITMQ_USERNAME env var secret key
251269
*/}}
252-
{{- define "cf-common-0.18.1.classic.rabbitmq-username-env-var-secret-key" }}
270+
{{- define "cf-common-0.18.2.classic.rabbitmq-username-env-var-secret-key" }}
253271
{{- if or .Values.rabbitmqUsernameSecretKeyRef .Values.global.rabbitmqUsernameSecretKeyRef }}
254272
{{- printf (coalesce .Values.rabbitmqUsernameSecretKeyRef.key .Values.global.rabbitmqUsernameSecretKeyRef.key) }}
255273
{{- else }}
@@ -260,18 +278,18 @@ RABBITMQ_USERNAME env var secret key
260278
{{- /*
261279
FIREBASE_SECRET env var secret name
262280
*/}}
263-
{{- define "cf-common-0.18.1.classic.firebase-secret-env-var-secret-name" }}
281+
{{- define "cf-common-0.18.2.classic.firebase-secret-env-var-secret-name" }}
264282
{{- if or .Values.firebaseSecretSecretKeyRef .Values.global.firebaseSecretSecretKeyRef }}
265283
{{- printf (coalesce .Values.firebaseSecretSecretKeyRef.name .Values.global.firebaseSecretSecretKeyRef.name) }}
266284
{{- else }}
267-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
285+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
268286
{{- end }}
269287
{{- end }}
270288

271289
{{- /*
272290
FIREBASE_SECRET env var secret key
273291
*/}}
274-
{{- define "cf-common-0.18.1.classic.firebase-secret-env-var-secret-key" }}
292+
{{- define "cf-common-0.18.2.classic.firebase-secret-env-var-secret-key" }}
275293
{{- if or .Values.firebaseSecretSecretKeyRef .Values.global.firebaseSecretSecretKeyRef }}
276294
{{- printf (coalesce .Values.firebaseSecretSecretKeyRef.key .Values.global.firebaseSecretSecretKeyRef.key) }}
277295
{{- else }}
@@ -282,18 +300,18 @@ FIREBASE_SECRET env var secret key
282300
{{- /*
283301
FIREBASE_URL env var secret name
284302
*/}}
285-
{{- define "cf-common-0.18.1.classic.firebase-url-env-var-secret-name" }}
303+
{{- define "cf-common-0.18.2.classic.firebase-url-env-var-secret-name" }}
286304
{{- if or .Values.firebaseUrlSecretKeyRef .Values.global.firebaseUrlSecretKeyRef }}
287305
{{- printf (coalesce .Values.firebaseUrlSecretKeyRef.name .Values.global.firebaseUrlSecretKeyRef.name) }}
288306
{{- else }}
289-
{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }}
307+
{{- printf "%s-%s" (include "cf-common-0.18.2.names.fullname" .) "secret" }}
290308
{{- end }}
291309
{{- end }}
292310

293311
{{- /*
294312
FIREBASE_URL env var secret key
295313
*/}}
296-
{{- define "cf-common-0.18.1.classic.firebase-url-env-var-secret-key" }}
314+
{{- define "cf-common-0.18.2.classic.firebase-url-env-var-secret-key" }}
297315
{{- if or .Values.firebaseUrlSecretKeyRef .Values.global.firebaseUrlSecretKeyRef }}
298316
{{- printf (coalesce .Values.firebaseUrlSecretKeyRef.key .Values.global.firebaseUrlSecretKeyRef.key) }}
299317
{{- 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.18.1.classic.calculateRabbitMqUri" . }}
5+
{{ include "cf-common-0.18.2.classic.calculateRabbitMqUri" . }}
66
*/}}
77

8-
{{- define "cf-common-0.18.1.classic.calculateRabbitMqUri" }}
8+
{{- define "cf-common-0.18.2.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.18.1.classic.calculateMongoUri" (dict "dbName" $.Values.global.pipelineManagerService "mongoURI" $.Values.global.mongoURI) }}
26+
{{ include "cf.common-0.18.2.classic.calculateMongoUri" (dict "dbName" $.Values.global.pipelineManagerService "mongoURI" $.Values.global.mongoURI) }}
2727
*/}}
28-
{{- define "cf-common-0.18.1.classic.calculateMongoUri" -}}
28+
{{- define "cf-common-0.18.2.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.18.1.classic.calculateConsulUri" }}
42+
{{- define "cf-common-0.18.2.classic.calculateConsulUri" }}
4343
{{- if .Values.global.consulHost }}
4444
{{- printf "http://%s:%v" .Values.global.consulHost .Values.global.consulHttpPort -}}
4545
{{- else }}

0 commit comments

Comments
 (0)