Skip to content

Commit

Permalink
AAE-2970 release 7.1.0-M8 (#42)
Browse files Browse the repository at this point in the history
* AAE-2970 release 7.1.0-M8
  • Loading branch information
SohelSaiyed authored and mteodori committed Jul 17, 2020
1 parent 33e4417 commit 6bbe0fd
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
22 changes: 11 additions & 11 deletions helm/alfresco-process-infrastructure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf

| Repository | Name | Version |
|------------|------|---------|
| https://activiti.github.io/activiti-cloud-helm-charts | common | 1.1.40 |
| https://kubernetes-charts.alfresco.com/incubator | alfresco-adf-app | 2.2.1 |
| https://kubernetes-charts.alfresco.com/incubator | alfresco-adf-app | 2.2.1 |
| https://kubernetes-charts.alfresco.com/incubator | alfresco-identity-service | 2.0.2 |
| https://kubernetes-charts.alfresco.com/incubator | alfresco-process-springboot-service | 2.2.1 |
| https://kubernetes-charts.alfresco.com/incubator | alfresco-process-springboot-service | 2.2.1 |
| https://activiti.github.io/activiti-cloud-helm-charts | common | 1.1.44 |
| https://kubernetes-charts.alfresco.com/stable | alfresco-adf-app | 2.2.1 |
| https://kubernetes-charts.alfresco.com/stable | alfresco-adf-app | 2.2.1 |
| https://kubernetes-charts.alfresco.com/stable | alfresco-identity-service | 2.0.0 |
| https://kubernetes-charts.alfresco.com/stable | alfresco-process-springboot-service | 2.2.1 |
| https://kubernetes-charts.alfresco.com/stable | alfresco-process-springboot-service | 2.2.1 |
| https://kubernetes-charts.storage.googleapis.com | postgresql | 6.3.9 |
| https://kubernetes-charts.storage.googleapis.com | postgresql | 6.3.9 |

Expand All @@ -30,7 +30,7 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf
| alfresco-admin-app.extraEnv | string | `"- name: APP_ALLOW_CUSTOM_RESOURCES\n value: \"{{ .Values.applications.allow_custom_resources }}\"\n"` | |
| 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-M8"` | |
| alfresco-admin-app.ingress.hostName | string | `nil` | |
| alfresco-admin-app.ingress.path | string | `"/admin"` | |
| alfresco-admin-app.nameOverride | string | `"alfresco-admin-app"` | |
Expand All @@ -55,14 +55,14 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf
| alfresco-deployment-service.environment.apiUrl | string | `""` | |
| alfresco-deployment-service.environment.namespace | string | installation namespace | namespace to copy secrets from to application namespaces |
| alfresco-deployment-service.extraContainers | string | `"- name: dind\n image: \"{{ .Values.dind.image.repository }}:{{ .Values.dind.image.tag }}\"\n imagePullPolicy: IfNotPresent\n securityContext:\n privileged: true\n tty: true\n env:\n - name: DOCKER_HOST\n value: tcp://localhost:2375\n resources:\n requests:\n cpu: 1\n memory: 1024Mi\n limits:\n cpu: 2\n memory: 2048Mi\n volumeMounts:\n - mountPath: /var/lib/docker\n name: docker-daemon\n"` | |
| alfresco-deployment-service.extraEnv | string | `"- name: DOCKER_HOST\n value: tcp://localhost:2375\n- 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_SERVER\n value: \"{{ .Values.dockerRegistry.server }}\"\n- name: DOCKER_REGISTRY_USERNAME\n value: \"{{ .Values.dockerRegistry.userName }}\"\n- name: DOCKER_REGISTRY_PASSWORD\n value: '{{ .Values.dockerRegistry.password }}'\n- name: DOCKER_REGISTRY_SECRET_NAME\n value: \"{{ .Values.dockerRegistry.secretName }}\"\n- name: DOCKER_REGISTRY_IMAGE_TAG\n value: \"develop\"\n- name: CONTENT_SERVICE_BASE_URL\n value: '{{ template \"alfresco-process-infrastructure.acs-url\" . }}'\n- name: CONTENT_SERVICE_ENABLED\n value: '{{ index .Values \"alfresco-content-services\" \"enabled\" }}'\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.connectorVolume.storageClass }}\"\n- name: PROJECT_RELEASE_VOLUME_PERMISSION\n value: \"{{ .Values.connectorVolume.permission }}\"\n- name: APPLICATIONS_DATABASE_EXTERNAL\n value: \"{{ .Values.applications.database.external }}\"\n{{- if .Values.applications.connectors.emailConnector.username }}\n- name: CONNECTOR_EMAILCONNECTOR_USERNAME\n value: \"{{ .Values.applications.connectors.emailConnector.username }}\"\n{{- end }}\n{{- if .Values.applications.connectors.emailConnector.password }}\n- name: CONNECTOR_EMAILCONNECTOR_PASSWORD\n value: \"{{ .Values.applications.connectors.emailConnector.password }}\"\n{{- end }}\n{{- if .Values.applications.connectors.emailConnector.host }}\n- name: CONNECTOR_EMAILCONNECTOR_HOST\n value: \"{{ .Values.applications.connectors.emailConnector.host }}\"\n{{- end }}\n{{- if .Values.applications.connectors.emailConnector.port }}\n- name: CONNECTOR_EMAILCONNECTOR_PORT\n value: \"{{ .Values.applications.connectors.emailConnector.port }}\"\n{{- end }}\n- name: APPLICATIONS_MAXNUMBER\n value: \"{{ .Values.applications.max_number }}\"\n"` | |
| alfresco-deployment-service.extraEnv | string | `"- name: DOCKER_HOST\n value: tcp://localhost:2375\n- 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_SERVER\n value: \"{{ .Values.dockerRegistry.server }}\"\n- name: DOCKER_REGISTRY_USERNAME\n value: \"{{ .Values.dockerRegistry.userName }}\"\n- name: DOCKER_REGISTRY_PASSWORD\n value: '{{ .Values.dockerRegistry.password }}'\n- name: DOCKER_REGISTRY_SECRET_NAME\n value: \"{{ .Values.dockerRegistry.secretName }}\"\n- name: DOCKER_REGISTRY_IMAGE_TAG\n value: \"7.1.0-M8\"\n- name: CONTENT_SERVICE_BASE_URL\n value: '{{ template \"alfresco-process-infrastructure.acs-url\" . }}'\n- name: CONTENT_SERVICE_ENABLED\n value: '{{ index .Values \"alfresco-content-services\" \"enabled\" }}'\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.connectorVolume.storageClass }}\"\n- name: PROJECT_RELEASE_VOLUME_PERMISSION\n value: \"{{ .Values.connectorVolume.permission }}\"\n- name: APPLICATIONS_DATABASE_EXTERNAL\n value: \"{{ .Values.applications.database.external }}\"\n{{- if .Values.applications.connectors.emailConnector.username }}\n- name: CONNECTOR_EMAILCONNECTOR_USERNAME\n value: \"{{ .Values.applications.connectors.emailConnector.username }}\"\n{{- end }}\n{{- if .Values.applications.connectors.emailConnector.password }}\n- name: CONNECTOR_EMAILCONNECTOR_PASSWORD\n value: \"{{ .Values.applications.connectors.emailConnector.password }}\"\n{{- end }}\n{{- if .Values.applications.connectors.emailConnector.host }}\n- name: CONNECTOR_EMAILCONNECTOR_HOST\n value: \"{{ .Values.applications.connectors.emailConnector.host }}\"\n{{- end }}\n{{- if .Values.applications.connectors.emailConnector.port }}\n- name: CONNECTOR_EMAILCONNECTOR_PORT\n value: \"{{ .Values.applications.connectors.emailConnector.port }}\"\n{{- end }}\n- name: APPLICATIONS_MAXNUMBER\n value: \"{{ .Values.applications.max_number }}\"\n"` | |
| alfresco-deployment-service.extraInit.image.repository | string | `"bitnami/minideb-extras"` | |
| alfresco-deployment-service.extraInit.image.tag | string | `"stretch"` | |
| alfresco-deployment-service.extraVolumeMounts | string | `"- name: license\n mountPath: \"/root/.activiti/enterprise-license/\"\n readOnly: true\n"` | |
| alfresco-deployment-service.extraVolumes | string | `"- name: config\n configMap:\n name: {{ .Release.Name }}-deployment-config\n defaultMode: 0744\n- name: docker-daemon\n emptyDir: {}\n- name: license\n secret:\n secretName: licenseaps\n"` | |
| alfresco-deployment-service.image.pullPolicy | string | `"Always"` | |
| 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-M8"` | |
| alfresco-deployment-service.ingress.enabled | bool | `true` | |
| alfresco-deployment-service.ingress.path | string | `"/deployment-service"` | |
| alfresco-deployment-service.postgres.enabled | bool | `true` | |
Expand Down Expand Up @@ -93,7 +93,7 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf
| alfresco-modeling-app.env.APP_CONFIG_OAUTH2_SILENT_LOGIN | string | `"true"` | |
| 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-M8"` | |
| alfresco-modeling-app.ingress.path | string | `"/modeling"` | |
| alfresco-modeling-app.nameOverride | string | `"alfresco-modeling-app"` | |
| alfresco-modeling-service.content.client.id | string | `""` | |
Expand All @@ -104,7 +104,7 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf
| alfresco-modeling-service.extraVolumes | string | `"- name: license\n secret:\n secretName: licenseaps\n"` | |
| alfresco-modeling-service.image.pullPolicy | string | `"Always"` | |
| 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-M8"` | |
| 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 | `""` | |
Expand Down
14 changes: 7 additions & 7 deletions helm/alfresco-process-infrastructure/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
dependencies:
- name: common
repository: https://activiti.github.io/activiti-cloud-helm-charts
version: 1.1.40
version: 1.1.44
- name: alfresco-identity-service
version: 2.0.2
repository: https://kubernetes-charts.alfresco.com/incubator
version: 2.0.0
repository: https://kubernetes-charts.alfresco.com/stable
condition: alfresco-identity-service.enabled
alias: alfresco-identity-service
- name: alfresco-process-springboot-service
alias: alfresco-modeling-service
version: 2.2.1
repository: https://kubernetes-charts.alfresco.com/incubator
repository: https://kubernetes-charts.alfresco.com/stable
- name: postgresql
alias: postgresql-ams
version: 6.3.9
Expand All @@ -19,7 +19,7 @@ dependencies:
- name: alfresco-adf-app
alias: alfresco-modeling-app
version: 2.2.1
repository: https://kubernetes-charts.alfresco.com/incubator
repository: https://kubernetes-charts.alfresco.com/stable
- name: postgresql
alias: postgresql-ads
version: 6.3.9
Expand All @@ -28,10 +28,10 @@ dependencies:
- name: alfresco-process-springboot-service
alias: alfresco-deployment-service
version: 2.2.1
repository: https://kubernetes-charts.alfresco.com/incubator
repository: https://kubernetes-charts.alfresco.com/stable
condition: alfresco-deployment-service.enabled
- name: alfresco-adf-app
alias: alfresco-admin-app
version: 2.2.1
repository: https://kubernetes-charts.alfresco.com/incubator
repository: https://kubernetes-charts.alfresco.com/stable
condition: alfresco-deployment-service.enabled,alfresco-admin-app.enabled
10 changes: 5 additions & 5 deletions helm/alfresco-process-infrastructure/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ alfresco-modeling-service:
readOnly: true
image:
repository: quay.io/alfresco/alfresco-modeling-service
tag: develop
tag: 7.1.0-M8
pullPolicy: Always
postgres:
enabled: true
Expand Down Expand Up @@ -168,7 +168,7 @@ alfresco-modeling-app:
path: /modeling
image:
repository: quay.io/alfresco/alfresco-modeling-app
tag: develop
tag: 7.1.0-M8
pullPolicy: IfNotPresent
env:
APP_CONFIG_AUTH_TYPE: "OAUTH"
Expand Down Expand Up @@ -206,7 +206,7 @@ alfresco-deployment-service:
enabled: false
image:
repository: quay.io/alfresco/alfresco-deployment-service
tag: develop
tag: 7.1.0-M8
pullPolicy: Always
extraInit:
image:
Expand Down Expand Up @@ -314,7 +314,7 @@ alfresco-deployment-service:
- name: DOCKER_REGISTRY_SECRET_NAME
value: "{{ .Values.dockerRegistry.secretName }}"
- name: DOCKER_REGISTRY_IMAGE_TAG
value: "develop"
value: "7.1.0-M8"
- name: CONTENT_SERVICE_BASE_URL
value: '{{ template "alfresco-process-infrastructure.acs-url" . }}'
- name: CONTENT_SERVICE_ENABLED
Expand Down Expand Up @@ -362,7 +362,7 @@ alfresco-admin-app:
path: /admin
image:
repository: quay.io/alfresco/alfresco-admin-app
tag: develop
tag: 7.1.0-M8
pullPolicy: IfNotPresent
applications:
allow_custom_resources: true
Expand Down

0 comments on commit 6bbe0fd

Please sign in to comment.