diff --git a/charts/alfresco-search-service/README.md b/charts/alfresco-search-service/README.md index 4b52802b7..b5ede60a9 100644 --- a/charts/alfresco-search-service/README.md +++ b/charts/alfresco-search-service/README.md @@ -59,10 +59,10 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | repository.existingConfigMap.keys.port | string | `"SOLR_ALFRESCO_PORT"` | Key within the configmap holding the repository port | | repository.existingConfigMap.keys.securecomms | string | `"SOLR_ALFRESCO_SECURE_COMMS"` | Key within the configmap holding the repository security level | | repository.existingConfigMap.name | string | `nil` | Name of a pre-existing configmap containing Alfresco repository URL In addition to tjhe keys mentionned bellow the configMap may contain any solr property translated as an env variable (e.g SOLR_ALFRESCO_BASEURL). | -| repository.existingSecret.keys.shared-secret | string | `"SOLR_ALFRESCO_SECURECOMMS_SECRET"` | Key within the secret holding the repository shared secret | +| repository.existingSecret.keys.sharedSecret | string | `"SOLR_ALFRESCO_SECURECOMMS_SECRET"` | Key within the secret holding the repository shared secret | | repository.existingSecret.name | string | `nil` | Name of a pre-existing secret containing message broker credentials | -| repository.securecomms | string | `"secret"` | repository seucurity level to use when tracking the repo ('none' or 'secret') | -| repository.shared-secret | string | `nil` | Secret shared with the repository when securecomms is set to 'secret' | +| repository.securecomms | string | `"secret"` | repository security level to use when tracking the repo ('none' or 'secret') | +| repository.sharedSecret | string | `nil` | Secret shared with the repository when securecomms is set to 'secret' | | repository.url | string | `"http://alfresco-search-service/solr"` | Alfresco repository URL | | resources.limits.cpu | string | `"4"` | | | resources.limits.memory | string | `"2000Mi"` | | diff --git a/charts/alfresco-search-service/ci/default-values.yaml b/charts/alfresco-search-service/ci/default-values.yaml index b0354757e..2e0fdc994 100644 --- a/charts/alfresco-search-service/ci/default-values.yaml +++ b/charts/alfresco-search-service/ci/default-values.yaml @@ -3,4 +3,4 @@ alfresco-insight-zeppelin: nameOverride: zeppelin enabled: true repository: - shared-secret: dummy + sharedSecret: dummy diff --git a/charts/alfresco-search-service/templates/deployment.yaml b/charts/alfresco-search-service/templates/deployment.yaml index 242a9e8d6..28e80fa67 100644 --- a/charts/alfresco-search-service/templates/deployment.yaml +++ b/charts/alfresco-search-service/templates/deployment.yaml @@ -53,7 +53,7 @@ spec: valueFrom: secretKeyRef: name: {{ $secret }} - key: {{ index .existingSecret.keys "shared-secret" }} + key: {{ index .existingSecret.keys "sharedSecret" }} {{- end }} - name: SOLR_ALFRESCO_HOST valueFrom: diff --git a/charts/alfresco-search-service/templates/secret-repository.yaml b/charts/alfresco-search-service/templates/secret-repository.yaml index e175f3911..ccf31a87c 100644 --- a/charts/alfresco-search-service/templates/secret-repository.yaml +++ b/charts/alfresco-search-service/templates/secret-repository.yaml @@ -8,8 +8,8 @@ metadata: {{- $ctx := dict "Values" (dict "nameOverride" (printf "%s-repository" {{ template "alfresco-search-service.labels" . }} type: Opaque data: - {{- $reqmsg := "Please provide a shared secret for solr and repository in value repository.shared-secret" }} - {{- $shared_secret := required $reqmsg (index .Values.repository "shared-secret") }} + {{- $reqmsg := "Please provide a shared secret for solr and repository in value repository.sharedSecret" }} + {{- $shared_secret := required $reqmsg (index .Values.repository "sharedSecret") }} SOLR_ALFRESCO_SECURECOMMS_SECRET: {{ $shared_secret | b64enc | quote }} {{- end }} {{- end }} diff --git a/charts/alfresco-search-service/values.yaml b/charts/alfresco-search-service/values.yaml index 4ad4a607d..9116340b9 100644 --- a/charts/alfresco-search-service/values.yaml +++ b/charts/alfresco-search-service/values.yaml @@ -64,16 +64,16 @@ ingress: repository: # -- Alfresco repository URL url: http://alfresco-search-service/solr - # -- repository seucurity level to use when tracking the repo ('none' or 'secret') + # -- repository security level to use when tracking the repo ('none' or 'secret') securecomms: secret # -- Secret shared with the repository when securecomms is set to 'secret' - shared-secret: null + sharedSecret: null existingSecret: # -- Name of a pre-existing secret containing message broker credentials name: null keys: # -- Key within the secret holding the repository shared secret - shared-secret: SOLR_ALFRESCO_SECURECOMMS_SECRET + sharedSecret: SOLR_ALFRESCO_SECURECOMMS_SECRET existingConfigMap: # -- Name of a pre-existing configmap containing Alfresco repository URL # In addition to tjhe keys mentionned bellow the configMap may contain any