From 09f97326c7b8a5a16a7430ff36ed4d491d905939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Barroso?= <1204625+rbarroso@users.noreply.github.com> Date: Wed, 17 Nov 2021 17:24:24 +0100 Subject: [PATCH] [AAE-6458] Update example projects template to M16 (#125) --- helm/alfresco-process-infrastructure/README.md | 4 ++-- helm/alfresco-process-infrastructure/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/alfresco-process-infrastructure/README.md b/helm/alfresco-process-infrastructure/README.md index 8b5fd3437..854613ee4 100644 --- a/helm/alfresco-process-infrastructure/README.md +++ b/helm/alfresco-process-infrastructure/README.md @@ -316,7 +316,7 @@ Kubernetes: `>=1.15.0-0` | alfresco-modeling-app.env.APP_CONFIG_IDENTITY_HOST | string | `"{{ include \"common.keycloak-url\" . }}/admin/realms/{{ include \"common.keycloak-realm\" . }}"` | | | alfresco-modeling-app.exampleProjects.disabled | bool | `false` | | | alfresco-modeling-app.exampleProjects.host | string | `"https://alfresco.github.io/apa-templates"` | | -| alfresco-modeling-app.exampleProjects.resource | string | `"index_7.1.0-dev.json"` | | +| alfresco-modeling-app.exampleProjects.resource | string | `"index_7.1.0-M16.json"` | | | alfresco-modeling-app.image.pullPolicy | string | `"Always"` | | | alfresco-modeling-app.image.repository | string | `"quay.io/alfresco/alfresco-modeling-app"` | | | alfresco-modeling-app.image.tag | string | `"develop"` | | @@ -341,7 +341,7 @@ Kubernetes: `>=1.15.0-0` | alfresco-modeling-service.db.username | string | `"alfresco"` | | | alfresco-modeling-service.enabled | bool | `true` | | | alfresco-modeling-service.exampleProjects.endpoint | string | `"https://alfresco.github.io/apa-templates"` | | -| alfresco-modeling-service.exampleProjects.resource | string | `"index_7.1.0-dev.json"` | | +| alfresco-modeling-service.exampleProjects.resource | string | `"index_7.1.0-M16.json"` | | | alfresco-modeling-service.extraEnv | string | `"- name: SERVER_PORT\n value: \"8080\"\n- name: SERVER_USEFORWARDHEADERS\n value: \"true\"\n- name: SERVER_TOMCAT_INTERNALPROXIES\n value: \".*\"\n- name: MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE\n value: \"*\"\n- name: CONTENT_CLIENT_ID\n value: \"{{ .Values.content.client.id }}\"\n- name: CONTENT_CLIENT_SECRET\n value: \"{{ .Values.content.client.secret }}\"\n- name: CONTENT_SERVICE_URL\n value: '{{ template \"alfresco-process-infrastructure.acs-url\" . }}'\n- name: CONTENT_SERVICE_PATH\n value: \"{{ .Values.content.service.path }}\"\n{{- with .Values.activiti.keycloak.clientId }}\n- name: ACTIVITI_KEYCLOAK_CLIENT_ID\n value: \"{{ tpl . $ }}\"\n{{- end }}\n{{- with .Values.activiti.keycloak.clientSecret }}\n- name: ACTIVITI_KEYCLOAK_CLIENT_SECRET\n value: \"{{ tpl . $ }}\"\n{{- end }}\n- name: ACT_ALFRESCO_MODELING_TEMPLATES_ENDPOINT\n value: \"{{ .Values.exampleProjects.endpoint }}\"\n- name: ACT_ALFRESCO_MODELING_TEMPLATES_RESOURCE\n value: \"{{ .Values.exampleProjects.resource }}\""` | | | alfresco-modeling-service.extraVolumeMounts | string | `"- name: license\n mountPath: \"/root/.activiti/enterprise-license/\"\n readOnly: true"` | | | alfresco-modeling-service.extraVolumes | string | `"- name: license\n secret:\n secretName: licenseaps"` | | diff --git a/helm/alfresco-process-infrastructure/values.yaml b/helm/alfresco-process-infrastructure/values.yaml index ed4aadacb..e3e887f37 100644 --- a/helm/alfresco-process-infrastructure/values.yaml +++ b/helm/alfresco-process-infrastructure/values.yaml @@ -442,7 +442,7 @@ alfresco-modeling-service: clientSecret: "{{ .Values.global.keycloak.clientSecret }}" exampleProjects: endpoint: https://alfresco.github.io/apa-templates - resource: index_7.1.0-dev.json + resource: index_7.1.0-M16.json extraEnv: |- - name: SERVER_PORT value: "8080" @@ -496,7 +496,7 @@ alfresco-modeling-app: exampleProjects: disabled: false host: https://alfresco.github.io/apa-templates - resource: index_7.1.0-dev.json + resource: index_7.1.0-M16.json env: APP_CONFIG_AUTH_TYPE: OAUTH APP_CONFIG_ECM_HOST: '{{ template "alfresco-process-infrastructure.acs-url" . }}'