Skip to content

Commit

Permalink
OPSEXP-2291 Bump alfresco-search to 3.0.0-alpha.0 (#1071)
Browse files Browse the repository at this point in the history
  • Loading branch information
gionn authored Jan 17, 2024
1 parent ecadeaa commit 62c8126
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 37 deletions.
6 changes: 3 additions & 3 deletions helm/alfresco-content-services/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
version: 1.0.0-alpha.2
- name: alfresco-search-service
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 2.0.0
version: 3.0.0-alpha.0
- name: alfresco-sync-service
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 5.0.0-alpha.2
Expand All @@ -47,5 +47,5 @@ dependencies:
- name: elasticsearch
repository: https://helm.elastic.co
version: 7.17.3
digest: sha256:72c9b1031796f50ab28e14b2b23440a79b6e8ec644ecf91e95cec151e14deac4
generated: "2024-01-12T16:02:06.93509+01:00"
digest: sha256:add0aeea25d25f49d0ceed4a037aa34d1a8797cb6033841a2323380650032e6b
generated: "2024-01-12T16:58:53.556503+01:00"
2 changes: 1 addition & 1 deletion helm/alfresco-content-services/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dependencies:
- name: alfresco-search-service
alias: alfresco-search
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 2.0.0
version: 3.0.0-alpha.0
condition: alfresco-search.enabled
- name: alfresco-sync-service
repository: https://alfresco.github.io/alfresco-helm-charts/
Expand Down
2 changes: 1 addition & 1 deletion helm/alfresco-content-services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-msteams | 0.2.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.1.2 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search-enterprise | 3.1.0-alpha.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 2.0.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-search(alfresco-search-service) | 3.0.0-alpha.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | share(alfresco-share) | 0.3.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-sync-service | 5.0.0-alpha.2 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-transform-service | 1.0.0-alpha.2 |
Expand Down
24 changes: 0 additions & 24 deletions helm/alfresco-content-services/templates/_helpers-search.tpl
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
{{/*
Compute the search URL
Usage: include "alfresco-content-services.search.url" $
*/}}
{{- define "alfresco-content-services.search.url" -}}
{{- with .Values }}
{{- if .global.search.url }}
{{- .global.search.url }}
{{- else if and (index . "alfresco-search-enterprise" "enabled") (index . "alfresco-search-enterprise" "elasticsearch" "enabled") }}
{{- with (index . "alfresco-search-enterprise") }}
{{/* DRY needs a named template in subchart */}}
{{- printf "%s://%s-%s:%s" .elasticsearch.protocol .elasticsearch.clusterName .elasticsearch.nodeGroup .elasticsearch.httpPort }}
{{- end }}
{{- else if (index . "alfresco-search" "enabled") }}
{{/* DEPRECATE use chart.fullname with built ctx instead */}}
{{- template "alfresco-search-service.fullname" . }}-solr
{{- else }}
{{- fail "You must either set search.url, alfresco-search-enterprise.enabled or alfresco-search.enabled" }}
{{- end }}
{{- end }}
{{- end -}}

{{/*
Compute the search "flavor"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ data:
{{- if .Values.global.search.url }}
{{- $search_url = .Values.global.search.url }}
{{- else if eq "solr6" $search_flavor }}
{{- $searchCtx := dict "Values" (index .Values "alfresco-search") "Chart" .Chart "Release" .Release }}
{{- $search_url = printf "http://%s-solr/solr" (include "alfresco-search-service.fullname" $searchCtx) }}
{{- $search_url = printf "http://%s/solr" (include "alfresco-search-service.deployment.name" .) }}
{{- else if eq "elasticsearch" $search_flavor }}
{{- with .Values.elasticsearch }}
{{- if .enabled }}
Expand Down
2 changes: 0 additions & 2 deletions helm/alfresco-content-services/templates/secret-search.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ metadata:
{{- include "alfresco-content-services.labels" $ | nindent 4 }}
type: Opaque
data:
{{- if eq "secret" .securecomms }}
SOLR_SECRET: {{ .sharedSecret | default "" | b64enc | quote }}
{{- end }}
{{- if eq "elasticsearch" (include "alfresco-content-services.search.flavor" $) }}
SEARCH_USERNAME: {{ .username | default "" | b64enc | quote }}
SEARCH_PASSWORD: {{ .password | default "" | b64enc | quote }}
Expand Down
4 changes: 2 additions & 2 deletions helm/alfresco-content-services/tests/config-infra_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ tests:
value: secret
- equal:
path: data.SEARCH_HOST
value: RELEASE-NAME-alfresco-search-solr
value: RELEASE-NAME-solr
- equal:
path: data.SEARCH_PORT
value: "80"
- equal:
path: data.SEARCH_URL
value: http://RELEASE-NAME-alfresco-search-solr/solr
value: http://RELEASE-NAME-solr/solr
- equal:
path: data.SOLR_BASE_URL
value: /solr
Expand Down
4 changes: 2 additions & 2 deletions helm/alfresco-content-services/tests/search_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ tests:
value: secret
- equal:
path: data.SEARCH_URL
value: http://RELEASE-NAME-alfresco-search-solr/solr
value: http://RELEASE-NAME-solr/solr
- equal:
path: data.SEARCH_HOST
value: RELEASE-NAME-alfresco-search-solr
value: RELEASE-NAME-solr
- equal:
path: data.SEARCH_PORT
value: "80"
Expand Down

0 comments on commit 62c8126

Please sign in to comment.