diff --git a/helm/alfresco-process-infrastructure/README.md b/helm/alfresco-process-infrastructure/README.md index 854613ee4..0fe343974 100644 --- a/helm/alfresco-process-infrastructure/README.md +++ b/helm/alfresco-process-infrastructure/README.md @@ -16,12 +16,12 @@ Kubernetes: `>=1.15.0-0` | Repository | Name | Version | |------------|------|---------| -| https://activiti.github.io/activiti-cloud-helm-charts | common | 7.1.0-M15 | -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-admin-app(common) | 7.1.0-M15 | -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-modeling-service(common) | 7.1.0-M15 | -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-modeling-app(common) | 7.1.0-M15 | -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-deployment-service(common) | 7.1.0-M15 | -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-tika-service(common) | 7.1.0-M15 | +| https://activiti.github.io/activiti-cloud-helm-charts | common | 7.1.0-M16 | +| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-admin-app(common) | 7.1.0-M16 | +| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-modeling-service(common) | 7.1.0-M16 | +| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-modeling-app(common) | 7.1.0-M16 | +| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-deployment-service(common) | 7.1.0-M16 | +| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-tika-service(common) | 7.1.0-M16 | | https://charts.bitnami.com/bitnami | postgresql | 9.1.1 | | https://charts.bitnami.com/bitnami | rabbitmq | 8.20.5 | | https://kubernetes-charts.alfresco.com/stable | alfresco-identity-service | 5.0.0 | @@ -36,9 +36,9 @@ Kubernetes: `>=1.15.0-0` | alfresco-admin-app.env.APP_CONFIG_BPM_HOST | string | `"{{ include \"common.gateway-url\" . }}"` | | | alfresco-admin-app.env.APP_CONFIG_IDENTITY_HOST | string | `"{{ include \"common.keycloak-url\" . }}/admin/realms/{{ include \"common.keycloak-realm\" . }}"` | | | alfresco-admin-app.extraEnv | string | `"- name: APP_ALLOW_CUSTOM_RESOURCES\n value: \"{{ .Values.applications.allowCustomResources }}\"\n{{- if .Values.global.acs.enabled }}\n- name: APP_CONFIG_ECM_HOST\n value: '{{ template \"alfresco-process-infrastructure.acs-url\" . }}'\n{{- else }}\n- name: APP_CONFIG_PROVIDER\n value: BPM\n{{- end }}"` | | -| alfresco-admin-app.image.pullPolicy | string | `"Always"` | | +| alfresco-admin-app.image.pullPolicy | string | `"IfNotPresent"` | | | alfresco-admin-app.image.repository | string | `"quay.io/alfresco/alfresco-admin-app"` | | -| alfresco-admin-app.image.tag | string | `"develop"` | | +| alfresco-admin-app.image.tag | string | `"7.1.0-M16"` | | | alfresco-admin-app.ingress.annotations."kubernetes.io/ingress.class" | string | `"nginx"` | | | alfresco-admin-app.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"Authorization, Content-Type, Accept"` | | | alfresco-admin-app.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | @@ -58,8 +58,8 @@ Kubernetes: `>=1.15.0-0` | alfresco-deployment-service.applications.connectors.emailConnector.port | string | `""` | email port | | alfresco-deployment-service.applications.connectors.emailConnector.username | string | `""` | email username | | alfresco-deployment-service.applications.database.external | bool | `true` | | -| alfresco-deployment-service.applications.image.pullPolicy | string | `"Always"` | default pull policy for all images used in application | -| alfresco-deployment-service.applications.image.tag | string | `"develop"` | default tag for all images used in application | +| alfresco-deployment-service.applications.image.pullPolicy | string | `"IfNotPresent"` | default pull policy for all images used in application | +| alfresco-deployment-service.applications.image.tag | string | `"7.1.0-M16"` | default tag for all images used in application | | alfresco-deployment-service.applications.maxNumber | int | 20 applications can be deployed by default | maximum number of application can be deployed | | alfresco-deployment-service.applications.processStorageService.clientSecret | string | `"08102f0f-025c-4226-8a3e-674343bff231"` | client secret for process storage | | alfresco-deployment-service.applications.rabbitmq.admin.url | string | `""` | RabbitMQ admin URL, derived from host if not set | @@ -76,9 +76,9 @@ Kubernetes: `>=1.15.0-0` | alfresco-deployment-service.extraEnv | string | `"- name: SERVER_PORT\n value: \"8080\"\n- name: SERVER_SERVLET_CONTEXTPATH\n value: \"{{ .Values.ingress.path }}\"\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: KEYCLOAK_AUTH_SERVER_URL\n value: '{{ include \"common.keycloak-url\" . }}'\n- name: DOCKER_REGISTRY_IMAGE_TAG\n value: \"{{ .Values.applications.image.tag }}\"\n- name: ALFRESCO_DOCKER_REGISTRY_IMAGEPULLPOLICY\n value: \"{{ .Values.applications.image.pullPolicy }}\"\n- name: CONTENT_SERVICE_BASE_URL\n value: '{{ template \"alfresco-process-infrastructure.acs-url\" . }}'\n- name: CONTENT_SERVICE_ENABLED\n value: \"{{ .Values.global.acs.enabled }}\"\n{{- with .Values.global.acs.activemq.url }}\n- name: CONTENT_SERVICE_ACTIVEMQ_URL\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.global.acs.activemq.username }}\n- name: CONTENT_SERVICE_ACTIVEMQ_USERNAME\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.global.acs.activemq.password }}\n- name: CONTENT_SERVICE_ACTIVEMQ_PASSWORD\n value: \"{{ . }}\"\n{{- end }}\n- name: MODELING_URL\n value: '{{ include \"common.gateway-url\" . }}/modeling-service'\n- name: ENVIRONMENT_HOST_URL\n value: '{{ include \"common.gateway-url\" . }}'\n- name: ENVIRONMENT_API_URL\n value: \"{{ .Values.environment.apiUrl }}\"\n- name: ENVIRONMENT_API_TOKEN\n value: \"{{ .Values.environment.apiToken }}\"\n- name: ENVIRONMENT_NAMESPACE\n value: \"{{ tpl .Values.environment.namespace . }}\"\n- name: PROJECT_RELEASE_VOLUME_STORAGE_CLASS\n value: \"{{ .Values.projectReleaseVolume.storageClass }}\"\n- name: PROJECT_RELEASE_VOLUME_PERMISSION\n value: \"{{ .Values.projectReleaseVolume.permission }}\"\n- name: APPLICATIONS_DATABASE_EXTERNAL\n value: \"{{ .Values.applications.database.external }}\"\n{{- with .Values.applications.connectors.emailConnector.username }}\n- name: CONNECTOR_EMAILCONNECTOR_USERNAME\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.applications.connectors.emailConnector.password }}\n- name: CONNECTOR_EMAILCONNECTOR_PASSWORD\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.applications.connectors.emailConnector.host }}\n- name: CONNECTOR_EMAILCONNECTOR_HOST\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.applications.connectors.emailConnector.port }}\n- name: CONNECTOR_EMAILCONNECTOR_PORT\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.applications.maxNumber }}\n- name: APPLICATIONS_MAXNUMBER\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.applications.processStorageService.clientSecret }}\n- name: PROCESS_STORAGE_SERVICE_CLIENTSECRET\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.applications.activiti.keycloak.clientId }}\n- name: ACTIVITI_KEYCLOAK_CLIENT_ID\n value: \"{{ tpl . $ }}\"\n{{- end }}\n{{- with .Values.applications.activiti.keycloak.clientSecret }}\n- name: ACTIVITI_KEYCLOAK_CLIENT_SECRET\n value: \"{{ tpl . $ }}\"\n{{- end }}\n{{- if .Values.applications.rabbitmq.host }}\n- name: APPLICATIONS_RABBITMQ_HOST\n value: \"{{ tpl .Values.applications.rabbitmq.host . }}\"\n{{- end }}\n{{- with .Values.applications.rabbitmq.username }}\n- name: APPLICATIONS_RABBITMQ_USERNAME\n value: \"{{ . }}\"\n{{- end }}\n{{- with .Values.applications.rabbitmq.password }}\n- name: APPLICATIONS_RABBITMQ_PASSWORD\n value: \"{{ . }}\"\n{{- end }}\n{{- if .Values.applications.rabbitmq.admin.url }}\n- name: APPLICATIONS_RABBITMQ_ADMIN_URL\n value: \"{{ tpl .Values.applications.rabbitmq.admin.url . }}\"\n{{- end }}\n- name: ATS_TRANSFORMER_TIKA_URL\n value: \"http://tika.{{ .Release.Namespace }}/transform\"\n- name: PROCESS_UI_URL\n value: '{{ include \"common.gateway-url\" . }}'"` | | | alfresco-deployment-service.extraVolumeMounts | string | `"- name: license\n mountPath: \"/root/.activiti/enterprise-license/\"\n readOnly: true"` | | | alfresco-deployment-service.extraVolumes | string | `"- name: config\n configMap:\n name: {{ .Release.Name }}-deployment-config\n defaultMode: 0744\n- name: license\n secret:\n secretName: licenseaps"` | | -| alfresco-deployment-service.image.pullPolicy | string | `"Always"` | | +| alfresco-deployment-service.image.pullPolicy | string | `"IfNotPresent"` | | | alfresco-deployment-service.image.repository | string | `"quay.io/alfresco/alfresco-deployment-service"` | | -| alfresco-deployment-service.image.tag | string | `"develop"` | | +| alfresco-deployment-service.image.tag | string | `"7.1.0-M16"` | | | alfresco-deployment-service.ingress.enabled | bool | `true` | | | alfresco-deployment-service.ingress.path | string | `"/deployment-service"` | | | alfresco-deployment-service.livenessProbe.path | string | `"{{ .Values.ingress.path }}/actuator/health/liveness"` | | @@ -317,9 +317,9 @@ Kubernetes: `>=1.15.0-0` | 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-M16.json"` | | -| alfresco-modeling-app.image.pullPolicy | string | `"Always"` | | +| alfresco-modeling-app.image.pullPolicy | string | `"IfNotPresent"` | | | alfresco-modeling-app.image.repository | string | `"quay.io/alfresco/alfresco-modeling-app"` | | -| alfresco-modeling-app.image.tag | string | `"develop"` | | +| alfresco-modeling-app.image.tag | string | `"7.1.0-M16"` | | | alfresco-modeling-app.ingress.annotations."kubernetes.io/ingress.class" | string | `"nginx"` | | | alfresco-modeling-app.ingress.annotations."nginx.ingress.kubernetes.io/cors-allow-headers" | string | `"Authorization, Content-Type, Accept"` | | | alfresco-modeling-app.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | @@ -345,9 +345,9 @@ Kubernetes: `>=1.15.0-0` | 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"` | | -| alfresco-modeling-service.image.pullPolicy | string | `"Always"` | | +| alfresco-modeling-service.image.pullPolicy | string | `"IfNotPresent"` | | | alfresco-modeling-service.image.repository | string | `"quay.io/alfresco/alfresco-modeling-service"` | | -| alfresco-modeling-service.image.tag | string | `"develop"` | | +| alfresco-modeling-service.image.tag | string | `"7.1.0-M16"` | | | alfresco-modeling-service.ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$1"` | | | alfresco-modeling-service.ingress.enabled | bool | `true` | | | alfresco-modeling-service.ingress.path | string | `""` | | diff --git a/helm/alfresco-process-infrastructure/requirements.yaml b/helm/alfresco-process-infrastructure/requirements.yaml index 1bc0739a9..1ea12e0d1 100644 --- a/helm/alfresco-process-infrastructure/requirements.yaml +++ b/helm/alfresco-process-infrastructure/requirements.yaml @@ -1,14 +1,14 @@ dependencies: - name: common repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 7.1.0-M15 + version: 7.1.0-M16 - name: alfresco-identity-service repository: https://kubernetes-charts.alfresco.com/stable version: 5.0.0 condition: alfresco-identity-service.enabled - name: common repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 7.1.0-M15 + version: 7.1.0-M16 alias: alfresco-modeling-service condition: alfresco-modeling-service.enabled - name: postgresql @@ -21,21 +21,21 @@ dependencies: condition: rabbitmq.enabled - name: common repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 7.1.0-M15 + version: 7.1.0-M16 alias: alfresco-modeling-app condition: alfresco-modeling-app.enabled - name: common repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 7.1.0-M15 + version: 7.1.0-M16 alias: alfresco-deployment-service condition: alfresco-deployment-service.enabled - name: common repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 7.1.0-M15 + version: 7.1.0-M16 alias: alfresco-admin-app condition: alfresco-admin-app.enabled - name: common repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 7.1.0-M15 + version: 7.1.0-M16 alias: alfresco-tika-service condition: alfresco-tika-service.enabled diff --git a/helm/alfresco-process-infrastructure/values.yaml b/helm/alfresco-process-infrastructure/values.yaml index e3e887f37..b8ff9e11c 100644 --- a/helm/alfresco-process-infrastructure/values.yaml +++ b/helm/alfresco-process-infrastructure/values.yaml @@ -415,8 +415,8 @@ alfresco-modeling-service: readOnly: true image: repository: quay.io/alfresco/alfresco-modeling-service - tag: develop - pullPolicy: Always + tag: 7.1.0-M16 + pullPolicy: IfNotPresent liquibase: enabled: true postgresql: @@ -488,8 +488,8 @@ alfresco-modeling-app: nameOverride: alfresco-modeling-app image: repository: quay.io/alfresco/alfresco-modeling-app - tag: develop - pullPolicy: Always + tag: 7.1.0-M16 + pullPolicy: IfNotPresent service: name: modeling-app envType: frontend @@ -525,8 +525,8 @@ alfresco-deployment-service: enabled: false image: repository: quay.io/alfresco/alfresco-deployment-service - tag: develop - pullPolicy: Always + tag: 7.1.0-M16 + pullPolicy: IfNotPresent postgresql: enabled: true db: @@ -537,9 +537,9 @@ alfresco-deployment-service: applications: image: # alfresco-deployment-service.applications.image.tag -- default tag for all images used in application - tag: develop + tag: 7.1.0-M16 # alfresco-deployment-service.applications.image.pullPolicy -- default pull policy for all images used in application - pullPolicy: Always + pullPolicy: IfNotPresent maxNumber: 20 # alfresco-deployment-service.applications.maxNumber -- maximum number of application can be deployed # @default -- 20 applications can be deployed by default @@ -717,8 +717,8 @@ alfresco-admin-app: nameOverride: alfresco-admin-app image: repository: quay.io/alfresco/alfresco-admin-app - tag: develop - pullPolicy: Always + tag: 7.1.0-M16 + pullPolicy: IfNotPresent service: name: admin-app envType: frontend