From 33e4417b5b927150af1d3d024b0616f65e14330b Mon Sep 17 00:00:00 2001 From: Sohel Saiyed Date: Wed, 24 Jun 2020 11:42:51 +0100 Subject: [PATCH] add application max_number variable (#40) --- helm/alfresco-process-infrastructure/README.md | 3 ++- helm/alfresco-process-infrastructure/values.yaml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/helm/alfresco-process-infrastructure/README.md b/helm/alfresco-process-infrastructure/README.md index fc1bd9a34..f323af443 100644 --- a/helm/alfresco-process-infrastructure/README.md +++ b/helm/alfresco-process-infrastructure/README.md @@ -41,6 +41,7 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf | 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 | `false` | | +| alfresco-deployment-service.applications.max_number | int | 20 applications can be deployed by default | maximum number of application can be deployed | | alfresco-deployment-service.connectorVolume.permission | string | `"ReadWriteMany"` | | | alfresco-deployment-service.connectorVolume.storageClass | string | `"default-sc"` | | | alfresco-deployment-service.dind.image.repository | string | `"docker"` | | @@ -54,7 +55,7 @@ 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"` | | +| 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.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"` | | diff --git a/helm/alfresco-process-infrastructure/values.yaml b/helm/alfresco-process-infrastructure/values.yaml index e42b7645b..bedac489b 100644 --- a/helm/alfresco-process-infrastructure/values.yaml +++ b/helm/alfresco-process-infrastructure/values.yaml @@ -222,6 +222,9 @@ alfresco-deployment-service: username: alfresco password: alfresco applications: + max_number: 20 + # alfresco-deployment-service.applications.max_number -- maximum number of application can be deployed + # @default -- 20 applications can be deployed by default database: external: false connectors: @@ -348,6 +351,8 @@ alfresco-deployment-service: - name: CONNECTOR_EMAILCONNECTOR_PORT value: "{{ .Values.applications.connectors.emailConnector.port }}" {{- end }} + - name: APPLICATIONS_MAXNUMBER + value: "{{ .Values.applications.max_number }}" alfresco-admin-app: