Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPSEXP-2242: propertify secrets #120

Merged
merged 3 commits into from
Sep 26, 2023
Merged

OPSEXP-2242: propertify secrets #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6be1fdb
add propertification of secret vars
alxgomz Sep 26, 2023
907db0a
bump alfresco-repository chart
alxgomz Sep 26, 2023
4129118
review comments
alxgomz Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/alfresco-repository/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: alfresco-repository
description: Alfresco content repository Helm chart
type: application
version: 0.1.0-alpha.10
version: 0.1.0-alpha.11
appVersion: 23.1.0-A21
dependencies:
- name: alfresco-common
Expand Down
4 changes: 2 additions & 2 deletions charts/alfresco-repository/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# alfresco-repository

![Version: 0.1.0-alpha.10](https://img.shields.io/badge/Version-0.1.0--alpha.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0-A21](https://img.shields.io/badge/AppVersion-23.1.0--A21-informational?style=flat-square)
![Version: 0.1.0-alpha.11](https://img.shields.io/badge/Version-0.1.0--alpha.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0-A21](https://img.shields.io/badge/AppVersion-23.1.0--A21-informational?style=flat-square)

Alfresco content repository Helm chart

Expand Down Expand Up @@ -117,7 +117,7 @@ environment:
| configuration.messageBroker.url | string | `nil` | Message Broker URL |
| configuration.messageBroker.username | string | `nil` | Username to authenticate to the message broker |
| configuration.repository.existingConfigMap | string | `nil` | a configmap containing the "alfresco-global.properties" key populated with actual Alfresco repository properties |
| configuration.repository.existingSecrets | list | `[{"key":"license.lic","name":"repository-secrets","purpose":"acs-license"}]` | A list of secrets to make available to the repository as env vars. This list can contain special secrets marked with predifined `purpose`: `acs-license` to pass license as a secret or subsystems:*:* to configure an Alfresco subsystem. See [Configuring Alfresco Subsystem](./docs/subsystems.md) for more details. |
| configuration.repository.existingSecrets | list | `[{"key":"license.lic","name":"repository-secrets","purpose":"acs-license"}]` | A list of secrets to make available to the repository as env vars. If the secrets needs to be used by the repo as a property on can use the following purpose syntax: 'property:name.of.the.prop' This list can contain special secrets marked with predifined `purpose`: `acs-license` to pass license as a secret or subsystems:*:* to configure an Alfresco subsystem. See [Configuring Alfresco Subsystem](./docs/subsystems.md) for more details. |
| configuration.search.existingConfigMap.keys.flavor | string | `"SEARCH_FLAVOR"` | configmap key where to find the search engine used |
| configuration.search.existingConfigMap.keys.host | string | `"SEARCH_HOST"` | configmap key where to find the hostname part of the search URL. The configmap may leverage the alfresco-repository.solr.cm named template to auto-generate it from the sole url parameter. |
| configuration.search.existingConfigMap.keys.port | string | `"SEARCH_PORT"` | configmap key where to find the port part of the search URL. The configmap may leverage the alfresco-repository.solr.cm named template to auto-generate it from the sole url parameter. |
Expand Down
6 changes: 6 additions & 0 deletions charts/alfresco-repository/templates/configmap-repository.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ data:
-Dmessaging.broker.password="$BROKER_PASSWORD"
-Dindex.subsystem.name="$SEARCH_FLAVOR"
{{- include "alfresco-repository.search.config" $ | indent 2 }}
{{- range .repository.existingSecrets }}
{{- if and .key (hasPrefix "property:" .purpose) }}
{{- $property := trimPrefix "property:" .purpose }}
{{- printf "-D%s=\"$%s\"" $property .key | nindent 4 }}
{{- end }}
{{- end }}
gionn marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
{{ .Values.environment.CATALINA_OPTS | default "" }}
JAVA_OPTS: >-
Expand Down
2 changes: 2 additions & 0 deletions charts/alfresco-repository/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ configuration:
# with actual Alfresco repository properties
existingConfigMap: null
# -- A list of secrets to make available to the repository as env vars.
# If the secrets needs to be used by the repo as a property on can use the
# following purpose syntax: 'property:name.of.the.prop'
gionn marked this conversation as resolved.
Show resolved Hide resolved
# This list can contain special secrets marked with predifined `purpose`:
# `acs-license` to pass license as a secret or subsystems:*:* to configure
# an Alfresco subsystem. See [Configuring Alfresco
Expand Down