diff --git a/.github/workflows/scale-down.yaml b/.github/workflows/scale-down.yaml index 87b2442..86eb3cd 100644 --- a/.github/workflows/scale-down.yaml +++ b/.github/workflows/scale-down.yaml @@ -4,7 +4,6 @@ on: schedule: - cron: '00 19 * * 1-5' workflow_dispatch: - jobs: scale-down: runs-on: ubuntu-latest @@ -51,4 +50,4 @@ jobs: for deployment in $DEPLOYMENTS; do kubectl scale $deployment --replicas=0 - done + done \ No newline at end of file diff --git a/.gitignore b/.gitignore index 018fff4..3c214bb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ .idea/ templated/ kustomize/base/charts/ -kustomize/overlays/**/charts/ -kustomize/overlays/**/output.yaml +kustomize/**/charts/ +kustomize/**/output.yaml kustomize/base/resources.yaml diff --git a/jobs/reindex/templates/_helpers.tpl b/jobs/reindex/templates/_helpers.tpl index 41ba7f2..b7134db 100644 --- a/jobs/reindex/templates/_helpers.tpl +++ b/jobs/reindex/templates/_helpers.tpl @@ -17,8 +17,5 @@ {{- end -}} {{- define "alfresco-search-enterprise.config.spring" -}} -{{- if and (not .Values.global.elasticsearch.host) (not .Values.searchIndex.host) }} - {{ fail "Please provide external elasticsearch connection details as values under .global.elasticsearch or .searchIndex or enable the embedded elasticsearch via .elasticsearch.enabled" }} -{{- end }} SPRING_ELASTICSEARCH_REST_URIS: "{{ .Values.global.elasticsearch.protocol }}://{{ .Values.global.elasticsearch.host }}:{{ .Values.global.elasticsearch.port }}" {{- end -}} diff --git a/jobs/reindex/templates/reindexing-config.yaml b/jobs/reindex/templates/reindexing-config.yaml index 2f5f728..4be2e1b 100644 --- a/jobs/reindex/templates/reindexing-config.yaml +++ b/jobs/reindex/templates/reindexing-config.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: ConfigMap metadata: - name: delius-alfresco-search-enterprise-reindexing-configmap + name: alfresco-content-services-alfresco-search-enterprise-reindexing-configmap data: ELASTICSEARCH_INDEXNAME: "{{ .Values.indexName }}" {{ template "alfresco-search-enterprise.config.spring" . }} - ALFRESCO_SHAREDFILESTORE_BASEURL: http://delius-alfresco-filestore:80/alfresco/api/-default-/private/sfs/versions/1/file/ - ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://delius-alfresco-router/transform/config + ALFRESCO_SHAREDFILESTORE_BASEURL: http://alfresco-content-services-alfresco-filestore:80/alfresco/api/-default-/private/sfs/versions/1/file/ + ALFRESCO_ACCEPTEDCONTENTMEDIATYPESCACHE_BASEURL: http://alfresco-content-services-alfresco-router/transform/config ALFRESCO_REINDEX_PATHINDEXINGENABLED: {{ .Values.pathIndexingEnabled | quote }} SPRING_DATASOURCE_URL: {{ .Values.postgresql.url }} {{- if .Values.environment }} diff --git a/jobs/reindex/templates/reindexing-job.yaml b/jobs/reindex/templates/reindexing-job.yaml index bf2dbc5..21fc109 100644 --- a/jobs/reindex/templates/reindexing-job.yaml +++ b/jobs/reindex/templates/reindexing-job.yaml @@ -1,7 +1,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: delius-alfresco-search-enterprise-reindexing + name: alfresco-content-services-alfresco-search-enterprise-reindexing spec: template: metadata: @@ -23,7 +23,7 @@ spec: - name: {{ .Values.imagePullSecrets }} restartPolicy: Never containers: - - name: delius-alfresco-search-enterprise-reindexing + - name: alfresco-content-services-alfresco-search-enterprise-reindexing image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} securityContext: @@ -36,12 +36,12 @@ spec: type: RuntimeDefault resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - name: delius-alfresco-reindexing-prefixes-file-volume + - name: reindexing-prefixes-file-volume mountPath: /alf/reindex.prefixes-file.json subPath: reindex.prefixes-file.json envFrom: - configMapRef: - name: delius-alfresco-search-enterprise-reindexing-configmap + name: alfresco-content-services-alfresco-search-enterprise-reindexing-configmap - secretRef: name: {{ .Values.messageBroker.existingSecretName }} # Ensure this value is set correctly env: @@ -68,9 +68,9 @@ spec: containerPort: 8080 protocol: TCP volumes: - - name: delius-alfresco-reindexing-prefixes-file-volume + - name: reindexing-prefixes-file-volume configMap: - name: delius-alfresco-reindexing-prefixes-file-configmap + name: reindexing-prefixes-file-configmap initContainers: - name: wait-for-repository image: curlimages/curl:7.79.1 @@ -83,7 +83,7 @@ spec: resources: {{- toYaml .Values.initcontainers.waitForRepository.resources | nindent 12 }} env: - name: ALFRESCO_REPOSITORY_URL - value: http://delius-alfresco-cs-repository/alfresco/api/-default-/public/alfresco/versions/1/probes/-ready- + value: http://alfresco-content-services-alfresco-cs-repository/alfresco/api/-default-/public/alfresco/versions/1/probes/-ready- command: [ "/bin/sh","-c" ] # Delay running the reindexing to give Alfresco Repository a chance to fully initialise args: [ "while [ $(curl -sw '%{http_code}' $ALFRESCO_REPOSITORY_URL -o /dev/null) -ne 200 ]; do sleep 5; echo 'Waiting for the Alfresco Repository...'; done; echo 'Alfresco is ready, delay reindexing to give a chance to fully initialise.'; sleep 30; echo 'Reindexing started!'" ] diff --git a/jobs/reindex/templates/reindexing-prefixes-config-map.yaml b/jobs/reindex/templates/reindexing-prefixes-config-map.yaml index 626e934..6ff9efc 100644 --- a/jobs/reindex/templates/reindexing-prefixes-config-map.yaml +++ b/jobs/reindex/templates/reindexing-prefixes-config-map.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: delius-alfresco-reindexing-prefixes-file-configmap + name: reindexing-prefixes-file-configmap data: reindex.prefixes-file.json: | { diff --git a/kustomize/base/patch-delete-reindexing-config-map.yaml b/kustomize/base/patch-delete-reindexing-config-map.yaml index eff6c64..f46c94b 100644 --- a/kustomize/base/patch-delete-reindexing-config-map.yaml +++ b/kustomize/base/patch-delete-reindexing-config-map.yaml @@ -2,4 +2,4 @@ $patch: delete apiVersion: v1 kind: ConfigMap metadata: - name: delius-alfresco-search-enterprise-reindexing-configmap + name: alfresco-content-services-alfresco-search-enterprise-reindexing-configmap diff --git a/kustomize/base/patch-ingress-repository.yaml b/kustomize/base/patch-ingress-repository.yaml index 9cf2be1..5653f51 100644 --- a/kustomize/base/patch-ingress-repository.yaml +++ b/kustomize/base/patch-ingress-repository.yaml @@ -1,7 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: delius-alfresco-cs-repository + name: alfresco-content-services-alfresco-cs-repository annotations: external-dns.alpha.kubernetes.io/aws-weight: "100" kubernetes.io/ingress.class: default diff --git a/kustomize/base/patch-ingress-share.yaml b/kustomize/base/patch-ingress-share.yaml index 6371de5..ed6a361 100644 --- a/kustomize/base/patch-ingress-share.yaml +++ b/kustomize/base/patch-ingress-share.yaml @@ -1,9 +1,13 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: delius-alfresco-cs-share + name: alfresco-content-services-alfresco-cs-share annotations: external-dns.alpha.kubernetes.io/aws-weight: "100" kubernetes.io/ingress.class: default + nginx.ingress.kubernetes.io/configuration-snippet: | + if ($request_uri = "/") { + return 301 /share/page/; + } spec: ingressClassName: default diff --git a/kustomize/base/values.yaml b/kustomize/base/values.yaml index da0b357..15588a1 100644 --- a/kustomize/base/values.yaml +++ b/kustomize/base/values.yaml @@ -29,7 +29,7 @@ repository: type: Recreate image: repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-content-repository - tag: content-9895398808-1 + tag: release_7.3.2_elasticsearch-r5.0-content-latest pullPolicy: IfNotPresent internalPort: 8080 hazelcastPort: 5701 @@ -639,7 +639,7 @@ share: image: # repository: quay.io/alfresco/alfresco-share repository: 754256621582.dkr.ecr.eu-west-2.amazonaws.com/hmpps-migration/alfresco-share - tag: share-9895398808-1 + tag: release_7.3.2_elasticsearch-r5.0-share-10369065562-1 pullPolicy: IfNotPresent internalPort: 8080 service: @@ -691,6 +691,13 @@ share: activemq: nameOverride: activemq enabled: true + resources: + requests: + cpu: "0.5" + memory: "1024Mi" + limits: + cpu: "2" + memory: "4096Mi" # -- Possibility to choose Node for pod, with a key-value pair label # e.g {"kubernetes.io/hostname": multinode-demo-m02} nodeSelector: {} @@ -781,7 +788,7 @@ alfresco-search-enterprise: existingSecretName: *acs_messageBroker_secretName searchIndex: # -- The host where service is available - host: opensearch-proxy-service-cloud-platform-62a206e0.hmpps-delius-alfrsco-poc.svc.cluster.local + host: null # -- The port where service is available port: 8080 # -- Valid values are http or https diff --git a/kustomize/dev/patch-ingress-repository.yaml b/kustomize/dev/patch-ingress-repository.yaml index 8e23bb8..d950e3d 100644 --- a/kustomize/dev/patch-ingress-repository.yaml +++ b/kustomize/dev/patch-ingress-repository.yaml @@ -1,10 +1,10 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: delius-alfresco-cs-repository + name: alfresco-content-services-alfresco-cs-repository annotations: - external-dns.alpha.kubernetes.io/set-identifier: delius-alfresco-cs-repository-hmpps-delius-alfresco-dev-green - nginx.ingress.kubernetes.io/whitelist-source-range: placeholder + external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-repository-hmpps-delius-alfresco-dev-green + nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder" spec: rules: - host: hmpps-delius-alfresco-dev.apps.live.cloud-platform.service.justice.gov.uk @@ -12,14 +12,14 @@ spec: paths: - backend: service: - name: delius-alfresco-cs-repository + name: alfresco-content-services-alfresco-cs-repository port: number: 80 path: / pathType: Prefix - backend: service: - name: delius-alfresco-cs-repository + name: alfresco-content-services-alfresco-cs-repository port: number: 80 path: /api-explorer diff --git a/kustomize/dev/patch-ingress-share.yaml b/kustomize/dev/patch-ingress-share.yaml index 732b360..7976e2d 100644 --- a/kustomize/dev/patch-ingress-share.yaml +++ b/kustomize/dev/patch-ingress-share.yaml @@ -1,30 +1,30 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: delius-alfresco-cs-share + name: alfresco-content-services-alfresco-cs-share annotations: - external-dns.alpha.kubernetes.io/set-identifier: delius-alfresco-cs-share-hmpps-delius-alfrsco-poc-green - nginx.ingress.kubernetes.io/whitelist-source-range: placeholder + external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-share-hmpps-delius-alfresco-dev-green + nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder" spec: rules: - - host: share.hmpps-delius-alfrsco-poc.apps.live.cloud-platform.service.justice.gov.uk + - host: share.hmpps-delius-alfresco-dev.apps.live.cloud-platform.service.justice.gov.uk http: paths: - backend: service: - name: delius-alfresco-cs-share + name: alfresco-content-services-alfresco-cs-share port: number: 80 path: / pathType: Prefix - backend: service: - name: delius-alfresco-cs-share + name: alfresco-content-services-alfresco-cs-share port: number: 80 path: /share/page/ pathType: Prefix tls: - hosts: - - share.hmpps-delius-alfrsco-poc.apps.live.cloud-platform.service.justice.gov.uk + - share.hmpps-delius-alfresco-dev.apps.live.cloud-platform.service.justice.gov.uk secretName: share-ingress-cert diff --git a/kustomize/poc/patch-ingress-repository.yaml b/kustomize/poc/patch-ingress-repository.yaml index 1e5655a..5c5ca2a 100644 --- a/kustomize/poc/patch-ingress-repository.yaml +++ b/kustomize/poc/patch-ingress-repository.yaml @@ -1,11 +1,10 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: delius-alfresco-cs-repository + name: alfresco-content-services-alfresco-cs-repository annotations: - external-dns.alpha.kubernetes.io/set-identifier: delius-alfresco-cs-repository-hmpps-delius-alfrsco-poc-green + external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-repository-hmpps-delius-alfrsco-poc-green nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder" - nginx.ingress.kubernetes.io/whitelist-source-range: placeholder spec: rules: - host: hmpps-delius-alfrsco-poc.apps.live.cloud-platform.service.justice.gov.uk @@ -13,14 +12,14 @@ spec: paths: - backend: service: - name: delius-alfresco-cs-repository + name: alfresco-content-services-alfresco-cs-repository port: number: 80 path: / pathType: Prefix - backend: service: - name: delius-alfresco-cs-repository + name: alfresco-content-services-alfresco-cs-repository port: number: 80 path: /api-explorer diff --git a/kustomize/poc/patch-ingress-share.yaml b/kustomize/poc/patch-ingress-share.yaml index 732b360..05e61d4 100644 --- a/kustomize/poc/patch-ingress-share.yaml +++ b/kustomize/poc/patch-ingress-share.yaml @@ -1,9 +1,9 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: delius-alfresco-cs-share + name: alfresco-content-services-alfresco-cs-share annotations: - external-dns.alpha.kubernetes.io/set-identifier: delius-alfresco-cs-share-hmpps-delius-alfrsco-poc-green + external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-share-hmpps-delius-alfrsco-poc-green nginx.ingress.kubernetes.io/whitelist-source-range: placeholder spec: rules: @@ -12,14 +12,14 @@ spec: paths: - backend: service: - name: delius-alfresco-cs-share + name: alfresco-content-services-alfresco-cs-share port: number: 80 path: / pathType: Prefix - backend: service: - name: delius-alfresco-cs-share + name: alfresco-content-services-alfresco-cs-share port: number: 80 path: /share/page/ diff --git a/kustomize/test/allowlist.yaml b/kustomize/test/allowlist.yaml new file mode 100644 index 0000000..803e2a8 --- /dev/null +++ b/kustomize/test/allowlist.yaml @@ -0,0 +1,46 @@ +- "35.176.126.163" # legacy delius-test-az1-nat-gateway +- "35.178.162.73" # legacy delius-test-az2-nat-gateway +- "52.56.195.113" # legacy delius-test-az3-nat-gateway +- "35.178.209.113" # Cloud Platform live-1-eu-west-2a +- "3.8.51.207" # Cloud Platform live-1-eu-west-2c +- "35.177.252.54" # Cloud Platform live-1-eu-west-2b +- "35.176.93.186/32" # MoJ GlobalProtect +- "35.177.125.252/32" # MoJ VPN Gateway Proxies +- "35.177.137.160/32" # MoJ VPN Gateway Proxies +- "81.134.202.29/32" # MoJ VPN +- "51.149.250.0/24" # PTTP / MoJO Production Account BYOIP CIDR range +- "51.149.251.0/24" # PTTP / MoJO Production Account BYOIP CIDR range - PreProd +- "213.121.161.112/28" # 102 Petty France WiFi +- "217.33.148.210/32" # Digital studio +- "13.43.9.198/32" # MP non_live_data-public-eu-west-2a-nat +- "13.42.163.245/32" # MP non_live_data-public-eu-west-2b-nat +- "18.132.208.127/32" # MP non_live_data-public-eu-west-2c-nat +- "51.149.249.0/29" # ARK Corsham Internet Egress Exponential-E +- "51.149.249.32/29" # ARK Corsham Internet Egress Exponential-E +- "194.33.192.0/25" # ARK internet (DOM1) +- "194.33.193.0/25" # ARK internet (DOM1) +- "194.33.196.0/25" # ARK internet (DOM1) +- "194.33.197.0/25" # ARK internet (DOM1) +- "195.59.75.0/24" # ARK internet (DOM1) +- "194.33.248.0/29" # ARK Corsham Internet Egress Vodafone +- "194.33.249.0/29" # ARK Corsham Internet Egress Vodafone +- "62.25.106.209/32" # OMNI +- "195.92.40.49/32" # OMNI +- "62.25.109.197/32" # Quantum +- "195.92.38.16/28" # Quantum +- "212.137.36.230/32" # Quantum +- "78.33.10.50/31" # Unilink AOVPN +- "78.33.10.52/30" # Unilink AOVPN +- "78.33.10.56/30" # Unilink AOVPN +- "78.33.10.60/32" # Unilink AOVPN +- "78.33.32.99/32" # Unilink AOVPN +- "78.33.32.100/30" # Unilink AOVPN +- "78.33.32.104/30" # Unilink AOVPN +- "78.33.32.108/32" # Unilink AOVPN +- "83.98.63.176/29" # Unilink AOVPN +- "194.75.210.216/29" # Unilink AOVPN +- "217.138.45.109/32" # Unilink AOVPN +- "217.138.45.110/32" # Unilink AOVPN +- "34.241.149.106/32" # Airflow in Analytical Platform +- "52.210.79.20/32" # Airflow in Analytical Platform +- "54.228.134.38/32" # Airflow in Analytical Platform diff --git a/kustomize/test/kustomization.yaml b/kustomize/test/kustomization.yaml new file mode 100644 index 0000000..eaf31f0 --- /dev/null +++ b/kustomize/test/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../base + +patches: + - path: patch-ingress-repository.yaml + - path: patch-ingress-share.yaml diff --git a/kustomize/test/patch-ingress-repository.yaml b/kustomize/test/patch-ingress-repository.yaml new file mode 100644 index 0000000..8af3ed6 --- /dev/null +++ b/kustomize/test/patch-ingress-repository.yaml @@ -0,0 +1,29 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: alfresco-content-services-alfresco-cs-repository + annotations: + external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-repository-hmpps-delius-alfresco-test-green + nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder" +spec: + rules: + - host: hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk + http: + paths: + - backend: + service: + name: alfresco-content-services-alfresco-cs-repository + port: + number: 80 + path: / + pathType: Prefix + - backend: + service: + name: alfresco-content-services-alfresco-cs-repository + port: + number: 80 + path: /api-explorer + pathType: Prefix + tls: + - hosts: + - hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk diff --git a/kustomize/test/patch-ingress-share.yaml b/kustomize/test/patch-ingress-share.yaml new file mode 100644 index 0000000..7d36bd7 --- /dev/null +++ b/kustomize/test/patch-ingress-share.yaml @@ -0,0 +1,30 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: alfresco-content-services-alfresco-cs-share + annotations: + external-dns.alpha.kubernetes.io/set-identifier: alfresco-content-services-alfresco-cs-share-hmpps-delius-alfresco-test-green + nginx.ingress.kubernetes.io/whitelist-source-range: "placeholder" +spec: + rules: + - host: share.hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk + http: + paths: + - backend: + service: + name: alfresco-content-services-alfresco-cs-share + port: + number: 80 + path: / + pathType: Prefix + - backend: + service: + name: alfresco-content-services-alfresco-cs-share + port: + number: 80 + path: /share/page/ + pathType: Prefix + tls: + - hosts: + - share.hmpps-delius-alfresco-test.apps.live.cloud-platform.service.justice.gov.uk + secretName: share-ingress-cert diff --git a/kustomize/test/values.yaml b/kustomize/test/values.yaml new file mode 100644 index 0000000..0658b74 --- /dev/null +++ b/kustomize/test/values.yaml @@ -0,0 +1,23 @@ +# this file overrides values defined in ./values.yaml +repository: + replicaCount: 2 + resources: # requests and limits set closer together to ensure CP stability + requests: + cpu: 1 + memory: 2Gi + limits: + cpu: 3 + memory: 4Gi + persistence: + baseSize: 100Gi +share: + replicaCount: 1 +externalHost: hmpps-delius-alfresco-dev.apps.live.cloud-platform.service.justice.gov.uk +externalProtocol: https +externalPort: 443 +tika: + replicaCount: 2 + resources: + limits: + cpu: 2 + memory: 2Gi diff --git a/makefile b/makefile index 22997af..4e9b820 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ # Define the Helm chart name and release name -CHART_NAME := delius +CHART_NAME := alfresco-content-services DEBUG := false ATOMIC := true @@ -8,8 +8,8 @@ ENV ?= poc # Helm upgrade/install command helm_upgrade: - $(eval BUCKET_NAME := $(shell kubectl get secrets s3-bucket-output -o jsonpath='{.data.BUCKET_NAME}' | base64 -d)) - @if [ "$(ENV)" = "poc" ]; then \ + @$(eval BUCKET_NAME := $(shell kubectl get secrets s3-bucket-output -o jsonpath='{.data.BUCKET_NAME}' | base64 -d)) + if [ "$(ENV)" == "poc" ]; then \ NAMESPACE=hmpps-delius-alfrsco-$(ENV); \ else \ NAMESPACE=hmpps-delius-alfresco-$(ENV); \ @@ -27,7 +27,12 @@ helm_upgrade: fi; \ echo "BUCKET_NAME: $(BUCKET_NAME)"; \ cd ./kustomize/$${ENV}; \ + OPENSEARCH_PREFIX=$$(kubectl get svc --namespace $${NAMESPACE} | grep 'opensearch-proxy-service-cloud-platform' | awk '{print $$1}'); \ + OPENSEARCH_HOST=$${OPENSEARCH_PREFIX}.$${NAMESPACE}.svc.cluster.local; \ + echo "OpenSearch Host: $${OPENSEARCH_HOST}"; \ + RDS_JDBC_URL=$$(kubectl get secrets rds-instance-output --namespace $${NAMESPACE} -o json | jq -r ".data | map_values(@base64d) | .RDS_JDBC_URL"); \ extracted=$$(yq 'join(",")' ./allowlist.yaml); \ + export extracted; \ echo "Whitelist: $${extracted}"; \ yq '.metadata.annotations."nginx.ingress.kubernetes.io/whitelist-source-range" = strenv(extracted)' -i ./patch-ingress-repository.yaml; \ yq '.metadata.annotations."nginx.ingress.kubernetes.io/whitelist-source-range" = strenv(extracted)' -i ./patch-ingress-share.yaml; \ @@ -35,9 +40,10 @@ helm_upgrade: helm upgrade --install $(CHART_NAME) alfresco/alfresco-content-services --version 6.0.2 --namespace $${NAMESPACE} \ --values=../base/values.yaml --values=./values.yaml \ --set s3connector.config.bucketName=$(BUCKET_NAME) \ - --set database.url=$$(kubectl get secrets rds-instance-output -o json | jq -r ".data | map_values(@base64d) | .RDS_JDBC_URL") \ - --set global.elasticsearch.host=$$(kubectl get svc | grep 'opensearch-proxy-service-cloud-platform' | awk '{print $$1}').$${NAMESPACE}.svc.cluster.local \ - --wait --timeout=20m \ + --set database.url=$${RDS_JDBC_URL} \ + --set global.elasticsearch.host=$${OPENSEARCH_HOST} \ + --set alfresco-search-enterprise.searchIndex.host=$${OPENSEARCH_HOST} \ + --wait --timeout=20m \ --post-renderer ../kustomizer.sh --post-renderer-args "$${HELM_POST_RENDERER_ARGS}" \ $${DEBUG_FLAG} $${ATOMIC_FLAG}; \ yq '.metadata.annotations."nginx.ingress.kubernetes.io/whitelist-source-range" = "placeholder"' -i ./patch-ingress-repository.yaml; \