Skip to content

Commit 799df1a

Browse files
bkenezbkenez
authored
fix: revert tls secret placeholders (#4239)
1 parent cf17bef commit 799df1a

File tree

4 files changed

+6
-72
lines changed

4 files changed

+6
-72
lines changed

‎charts/camunda-platform-8.8/README.md‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -410,16 +410,12 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
410410
| `global.elasticsearch.external` | if true, tries to connect to an external elasticsearch | `false` |
411411
| `global.elasticsearch.tls` | | |
412412
| `global.elasticsearch.tls.enabled` | enable tls for external elasticsearch | `false` |
413-
| `global.elasticsearch.tls.existingSecret` | (DEPRECATED - use global.elasticsearch.tls.secret instead) provide an already existing tls secret for connecting to external elasticsearch | `""` |
413+
| `global.elasticsearch.tls.existingSecret` | provide an already existing tls secret for connecting to external elasticsearch | `""` |
414414
| `global.elasticsearch.auth` | | |
415415
| `global.elasticsearch.auth.username` | the username for external elasticsearch | `""` |
416416
| `global.elasticsearch.auth.password` | (DEPRECATED - use global.elasticsearch.auth.secret instead) the password for external elasticsearch | `""` |
417417
| `global.elasticsearch.auth.existingSecret` | (DEPRECATED - use global.elasticsearch.auth.secret instead) you can provide an existing secret for the external elasticsearch password | `""` |
418418
| `global.elasticsearch.auth.existingSecretKey` | (DEPRECATED - use global.elasticsearch.auth.secret instead) you can provide an existing secret key for the external elasticsearch password | `password` |
419-
| `global.elasticsearch.tls.secret` | configuration to provide the TLS secret. | |
420-
| `global.elasticsearch.tls.secret.inlineSecret` | can be used to provide the TLS certificate as a plain-text value for non-production usage. | `""` |
421-
| `global.elasticsearch.tls.secret.existingSecret` | can be used to reference an existing Kubernetes Secret containing the TLS certificate. | `""` |
422-
| `global.elasticsearch.tls.secret.existingSecretKey` | defines the key within the existing secret object. | `""` |
423419
| `global.elasticsearch.auth.secret` | configuration to provide the authentication secret. | |
424420
| `global.elasticsearch.auth.secret.inlineSecret` | can be used to provide the password as a plain-text value for non-production usage. | `""` |
425421
| `global.elasticsearch.auth.secret.existingSecret` | can be used to reference an existing Kubernetes Secret containing the password. | `""` |
@@ -436,16 +432,12 @@ Please see the corresponding [release guide](../../docs/release.md) to find out
436432
| `global.opensearch.aws.enabled` | Enabling AWS IRSA | `false` |
437433
| `global.opensearch.tls` | | |
438434
| `global.opensearch.tls.enabled` | enable tls for external opensearch | `false` |
439-
| `global.opensearch.tls.existingSecret` | (DEPRECATED - use global.opensearch.tls.secret instead) provide an already existing tls secret for connecting to external opensearch | `""` |
435+
| `global.opensearch.tls.existingSecret` | provide an already existing tls secret for connecting to external opensearch | `""` |
440436
| `global.opensearch.auth` | | |
441437
| `global.opensearch.auth.username` | the username for external opensearch | `""` |
442438
| `global.opensearch.auth.password` | (DEPRECATED - use global.opensearch.auth.secret instead) the password for external opensearch | `""` |
443439
| `global.opensearch.auth.existingSecret` | (DEPRECATED - use global.opensearch.auth.secret instead) you can provide an existing secret for the external opensearch password | `""` |
444440
| `global.opensearch.auth.existingSecretKey` | (DEPRECATED - use global.opensearch.auth.secret instead) you can provide an existing secret key for the external opensearch password | `password` |
445-
| `global.opensearch.tls.secret` | configuration to provide the TLS secret. | |
446-
| `global.opensearch.tls.secret.inlineSecret` | can be used to provide the TLS certificate as a plain-text value for non-production usage. | `""` |
447-
| `global.opensearch.tls.secret.existingSecret` | can be used to reference an existing Kubernetes Secret containing the TLS certificate. | `""` |
448-
| `global.opensearch.tls.secret.existingSecretKey` | defines the key within the existing secret object. | `""` |
449441
| `global.opensearch.auth.secret` | configuration to provide the authentication secret. | |
450442
| `global.opensearch.auth.secret.inlineSecret` | can be used to provide the password as a plain-text value for non-production usage. | `""` |
451443
| `global.opensearch.auth.secret.existingSecret` | can be used to reference an existing Kubernetes Secret containing the password. | `""` |

‎charts/camunda-platform-8.8/templates/common/constraints.tpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,7 @@ Usage: {{ include "camundaPlatform.secretConfigurationWarnings" . }}
265265
{{- define "camundaPlatform.secretConfigurationWarnings" -}}
266266
{{- $secretConfigs := list
267267
(dict "path" "global.license" "config" .Values.global.license "plaintextKey" "key")
268-
(dict "path" "global.elasticsearch.tls" "config" .Values.global.elasticsearch.tls)
269268
(dict "path" "global.elasticsearch.auth" "config" .Values.global.elasticsearch.auth)
270-
(dict "path" "global.opensearch.tls" "config" .Values.global.opensearch.tls)
271269
(dict "path" "global.opensearch.auth" "config" .Values.global.opensearch.auth)
272270
(dict "path" "global.identity.auth.admin" "config" .Values.global.identity.auth.admin)
273271
(dict "path" "global.identity.auth.console" "config" .Values.global.identity.auth.console)

‎charts/camunda-platform-8.8/values.schema.json‎

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -244,28 +244,8 @@
244244
},
245245
"existingSecret": {
246246
"type": "string",
247-
"description": "(DEPRECATED - use global.elasticsearch.tls.secret instead) provide an already existing tls secret for connecting to external elasticsearch",
247+
"description": "provide an already existing tls secret for connecting to external elasticsearch",
248248
"default": ""
249-
},
250-
"secret": {
251-
"type": "object",
252-
"properties": {
253-
"inlineSecret": {
254-
"type": "string",
255-
"description": "can be used to provide the TLS certificate as a plain-text value for non-production usage.",
256-
"default": ""
257-
},
258-
"existingSecret": {
259-
"type": "string",
260-
"description": "can be used to reference an existing Kubernetes Secret containing the TLS certificate.",
261-
"default": ""
262-
},
263-
"existingSecretKey": {
264-
"type": "string",
265-
"description": "defines the key within the existing secret object.",
266-
"default": ""
267-
}
268-
}
269249
}
270250
}
271251
},
@@ -379,28 +359,8 @@
379359
},
380360
"existingSecret": {
381361
"type": "string",
382-
"description": "(DEPRECATED - use global.opensearch.tls.secret instead) provide an already existing tls secret for connecting to external opensearch",
362+
"description": "provide an already existing tls secret for connecting to external opensearch",
383363
"default": ""
384-
},
385-
"secret": {
386-
"type": "object",
387-
"properties": {
388-
"inlineSecret": {
389-
"type": "string",
390-
"description": "can be used to provide the TLS certificate as a plain-text value for non-production usage.",
391-
"default": ""
392-
},
393-
"existingSecret": {
394-
"type": "string",
395-
"description": "can be used to reference an existing Kubernetes Secret containing the TLS certificate.",
396-
"default": ""
397-
},
398-
"existingSecretKey": {
399-
"type": "string",
400-
"description": "defines the key within the existing secret object.",
401-
"default": ""
402-
}
403-
}
404364
}
405365
}
406366
},

0 commit comments

Comments
 (0)