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.

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

✨ Uncouple the reindexing job from the main helm charts #83

Merged
merged 42 commits into from
Aug 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
a64ae0a
update values for opensearch
georgepstaylor May 21, 2024
6695ae2
add makefile +chart changes
georgepstaylor May 22, 2024
5e26882
Update values.yaml
georgepstaylor May 23, 2024
522257f
Update values.yaml
georgepstaylor Jun 10, 2024
4286b16
Merge branch 'main' into NIT-1281-alfresco-po-c-to-configure-use
georgepstaylor Jul 3, 2024
769d295
update makefile
georgepstaylor Jul 4, 2024
31a2a11
Update values.yaml
georgepstaylor Jul 4, 2024
e8337f5
Update values.yaml
georgepstaylor Jul 4, 2024
d169814
Update values.yaml
georgepstaylor Jul 5, 2024
61bc596
vars
georgepstaylor Jul 5, 2024
b7c46bf
Update values.yaml
georgepstaylor Jul 8, 2024
cef3e99
Update values.yaml
georgepstaylor Jul 8, 2024
9bdba69
images
georgepstaylor Jul 11, 2024
e714ada
config map
georgepstaylor Jul 11, 2024
c47acb8
Revert "config map"
georgepstaylor Jul 11, 2024
ce13e32
Reapply "config map"
georgepstaylor Jul 11, 2024
59928ba
config map
georgepstaylor Jul 11, 2024
9b77314
images
georgepstaylor Jul 16, 2024
8406eae
Squashed commit of the following:
georgepstaylor Jul 16, 2024
4ec915d
Update ingress-share.yaml
georgepstaylor Jul 16, 2024
d27b4b3
Merge branch 'main' into NIT-1281-alfresco-po-c-to-configure-use
georgepstaylor Jul 16, 2024
51c167b
vals
georgepstaylor Jul 19, 2024
285a3cc
kustomize base
georgepstaylor Jul 22, 2024
62e0ae8
ingress
georgepstaylor Aug 2, 2024
3f6f2d3
setup makefiel
georgepstaylor Aug 2, 2024
4e723a9
ingress poc patches
georgepstaylor Aug 2, 2024
12e35ec
correct poc ingress
georgepstaylor Aug 2, 2024
d7a4187
Update values.yaml
georgepstaylor Aug 5, 2024
7967edb
update for helm values mergign
georgepstaylor Aug 5, 2024
4ec5bf2
updates
georgepstaylor Aug 5, 2024
d36b6f2
kustomization base
georgepstaylor Aug 5, 2024
a7815b8
rearrange patching for ingress to repeat less
georgepstaylor Aug 5, 2024
96e1239
fix ingress patching with allow list
georgepstaylor Aug 6, 2024
3705710
Merge branch 'main' of https://github.com/ministryofjustice/hmpps-del…
georgepstaylor Aug 6, 2024
5fb9291
:fire: remove alf charts
georgepstaylor Aug 6, 2024
c69eabc
rename values files
georgepstaylor Aug 8, 2024
08e0d83
:fire: disable reindexing job from helm values
georgepstaylor Aug 8, 2024
487f39d
:sparkles: Uncouple the reindexing job from the main helm charts
georgepstaylor Aug 9, 2024
675fff3
Merge branch 'main' into NIT-1448-alfresco-move-reindexing-job
georgepstaylor Aug 9, 2024
ac35273
Merge branch 'main' into NIT-1448-alfresco-move-reindexing-job
georgepstaylor Aug 9, 2024
30e3b72
Update values.yaml
georgepstaylor Aug 9, 2024
64b23c1
Update values.yaml
georgepstaylor Aug 9, 2024
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
Prev Previous commit
Next Next commit
add makefile +chart changes
  • Loading branch information
georgepstaylor committed May 22, 2024
commit 6695ae27a1e9d45993603f84dedb4bd458950ce5
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ data:
ALFRESCO_SHAREDFILESTORE_BASEURL: http://{{ template "alfresco.shortname" . }}-filestore:80/alfresco/api/-default-/private/sfs/versions/1/file/
ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://{{ template "alfresco.shortname" . }}-router/transform/config
ALFRESCO_REINDEX_PATHINDEXINGENABLED: {{ .Values.reindexing.pathIndexingEnabled | quote }}
{{- if .Values.reindexing.postgresql.url }}
SPRING_DATASOURCE_URL: {{ .Values.reindexing.postgresql.url }}
{{- else }}
SPRING_DATASOURCE_URL: jdbc:postgresql://{{ .Release.Name }}-{{ .Values.reindexing.postgresql.hostname }}:{{ .Values.reindexing.postgresql.port | default 5432 }}/{{ .Values.reindexing.postgresql.database }}
{{- end }}
# {{- if .Values.reindexing.postgresql.url }}
# SPRING_DATASOURCE_URL: {{ .Values.reindexing.postgresql.url }}
# {{- else }}
# SPRING_DATASOURCE_URL: jdbc:postgresql://{{ .Release.Name }}-{{ .Values.reindexing.postgresql.hostname }}:{{ .Values.reindexing.postgresql.port | default 5432 }}/{{ .Values.reindexing.postgresql.database }}
# {{- end }}
{{- if .Values.reindexing.environment }}
{{- range $key, $val := .Values.reindexing.environment }}
{{ $key }}: {{ $val | quote }}
Original file line number Diff line number Diff line change
@@ -29,6 +29,8 @@ spec:
name: {{ template "alfresco-search-enterprise.fullName" . }}-reindexing-configmap
- secretRef:
name: {{ default (printf "%s-messagebroker-secret" (include "alfresco-search-enterprise.fullName" .)) .Values.messageBroker.existingSecretName }}
- secretRef:
name: {{ .Values.reindexing.postgresql.existingSecretName }}
env:
- name: SPRING_DATASOURCE_PASSWORD
valueFrom:
@@ -40,6 +42,11 @@ spec:
secretKeyRef:
name: {{ default (printf "%s-postgresql-secret" (include "alfresco-search-enterprise.fullName" $)) $.Values.reindexing.postgresql.existingSecretName }}
key: DATABASE_USERNAME
- name: SPRING_DATASOURCE_URL
valueFrom:
secretKeyRef:
name: {{ default (printf "%s-postgresql-secret" (include "alfresco-search-enterprise.fullName" $)) $.Values.reindexing.postgresql.existingSecretName }}
key: RDS_JDBC_URL
{{- include "spring.activemq.env" . | nindent 12 }}
{{- include "alfresco-search-enterprise.config.spring.envCredentials" $ | nindent 12 }}
ports:
24 changes: 13 additions & 11 deletions alfresco-content-services/values.yaml
Original file line number Diff line number Diff line change
@@ -33,6 +33,10 @@ repository:
pullPolicy: IfNotPresent
internalPort: 8080
hazelcastPort: 5701
elasticsearch:
host: opensearch-proxy-service-cloud-platform-62a206e0.hmpps-delius-alfrsco-poc.svc.cluster.local
port: 8080
createIndexIfNotExists: true
initContainers:
db:
image:
@@ -216,9 +220,6 @@ msTeamsService:
baseUrl: change_me_alf_base_url
digitalWorkspace:
contextPath: /workspace/
elasticsearch:
host: opensearch-proxy-service-cloud-platform-62a206e0.hmpps-delius-alfrsco-poc.svc.cluster.local
port: 8080
microsoft:
app:
id: change_me_app_id
@@ -770,7 +771,7 @@ database:
# When using embedded postgres you need to also set `postgresql.existingSecret`.
existingSecretName: rds-instance-output
alfresco-search-enterprise:
enabled: false
enabled: true
liveIndexing:
mediation:
image:
@@ -794,10 +795,10 @@ alfresco-search-enterprise:
tag: 3.2.0
enabled: true
postgresql:
url:
hostname: postgresql-acs
database: alfresco
# existingSecretName: *acs_database_secretName
url:
hostname:
database:
existingSecretName: rds-instance-output
alfresco-digital-workspace:
nodeSelector: {}
enabled: false
@@ -1093,16 +1094,17 @@ global:
# s3Bucket:
# comprehendRoleARN:
# -- Shared connections details for Elasticsearch/Opensearch, required when
# alfresco-search-enterprise.enabled is true
# .enabled is true
elasticsearch:
# -- The host where service is available. The provided default is for when
# elasticsearch.enabled is true
host: elasticsearch-master
host: opensearch-proxy-service-cloud-platform-62a206e0.hmpps-delius-alfrsco-poc.svc.cluster.local
# -- The port where service is available
port: 9200
port: 8080
# -- Valid values are http or https
protocol: http
# -- The username required to access the service, if any
user: null
# -- The password required to access the service, if any
password: null
createIndexIfNotExist: true
43 changes: 43 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Define the Helm chart name and release name
CHART_NAME := alfresco-content-services
VALUES := values.yaml
VALUES_ENV := values_$(ENV).yaml
DEBUG := false

# Retrieve secrets using kubectl
get_secrets:
@SECRET=$$(awk '{print substr($$0, 19)}' <<< $$(kubectl get secrets alfresco-content-services-alfresco-repository-properties-secret -o jsonpath='{.data.alfresco-global\.properties}' | base64 -d)); \

if [ -z "$${SECRET}" ]; then \
SECRET=$$(openssl rand -base64 20); \
fi; \

BUCKET_NAME=$$(awk '{print substr($$0, 0)}' <<< $$(kubectl get secrets s3-bucket-output -o jsonpath='{.data.BUCKET_NAME}' | base64 -d)); \

$(MAKE) helm_upgrade SECRET=$${SECRET} BUCKET_NAME=$${BUCKET_NAME}

# Helm upgrade/install command
helm_upgrade:
@if [ "$(ENV)" = "poc" ]; then \
NAMESPACE=hmpps-delius-alfrsco-$(ENV); \
else \
NAMESPACE=hmpps-delius-alfresco-$(ENV); \
fi; \
echo "Using namespace: $${NAMESPACE}"; \
if [ "$(DEBUG)" = "true" ]; then \
DEBUG_FLAG="--debug"; \
else \
DEBUG_FLAG=""; \
fi; \
helm upgrade --install $(CHART_NAME) ./$(CHART_NAME) --namespace $${NAMESPACE} \
--values=./$(CHART_NAME)/$(VALUES) --values=./$(CHART_NAME)/$(VALUES_ENV) \
--set s3connector.config.bucketName=$(BUCKET_NAME) \
--set global.tracking.sharedsecret=$(SECRET) \
--atomic $${DEBUG_FLAG}

# Default target
.PHONY: default
default: get_secrets

# Phony targets
.PHONY: get_secrets helm_upgrade