From 5596804ffc960a16821b3ded8f94c6a2c0254a39 Mon Sep 17 00:00:00 2001 From: Marcello Teodori <151025+mteodori@users.noreply.github.com> Date: Wed, 10 Jun 2020 15:17:18 +0100 Subject: [PATCH] AAE-267 support install in any namespace (#37) * AAE-267 support install in any namespace * moved default to main property --- .pre-commit-config.yaml | 2 +- helm/alfresco-process-infrastructure/README.md | 6 +++++- helm/alfresco-process-infrastructure/values.yaml | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index db0b576e5..b5a80fd38 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/norwoodj/helm-docs - rev: v0.8.0 + rev: v0.13.0 hooks: - id: helm-docs diff --git a/helm/alfresco-process-infrastructure/README.md b/helm/alfresco-process-infrastructure/README.md index d68efd00d..bab8bb9b3 100644 --- a/helm/alfresco-process-infrastructure/README.md +++ b/helm/alfresco-process-infrastructure/README.md @@ -23,9 +23,11 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf | Key | Type | Default | Description | |-----|------|---------|-------------| +| alfresco-admin-app.applications.allow_custom_resources | bool | `true` | | | alfresco-admin-app.env.APP_CONFIG_AUTH_TYPE | string | `"OAUTH"` | | | 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.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"` | | @@ -33,6 +35,7 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf | alfresco-admin-app.ingress.path | string | `"/admin"` | | | alfresco-admin-app.nameOverride | string | `"alfresco-admin-app"` | | | alfresco-deployment-service.alfresco-content-services.enabled | bool | `true` | | +| alfresco-deployment-service.applications.database.external | bool | `false` | | | alfresco-deployment-service.connectorVolume.permission | string | `"ReadWriteMany"` | | | alfresco-deployment-service.connectorVolume.storageClass | string | `"default-sc"` | | | alfresco-deployment-service.dind.image.repository | string | `"docker"` | | @@ -44,8 +47,9 @@ Source code can be found [here](https://github.com/Alfresco/alfresco-process-inf | alfresco-deployment-service.enabled | bool | `true` | | | alfresco-deployment-service.environment.apiToken | string | `""` | | | 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: PROJECT_RELEASE_VOLUME_STORAGE_CLASS\n value: \"{{ .Values.connectorVolume.storageClass }}\"\n- name: PROJECT_RELEASE_VOLUME_PERMISSION\n value: \"{{ .Values.connectorVolume.permission }}\"\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"` | | | 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 df17da386..a08da819c 100644 --- a/helm/alfresco-process-infrastructure/values.yaml +++ b/helm/alfresco-process-infrastructure/values.yaml @@ -231,6 +231,9 @@ alfresco-deployment-service: environment: apiUrl: "" apiToken: "" + # alfresco-deployment-service.environment.namespace -- namespace to copy secrets from to application namespaces + # @default -- installation namespace + namespace: "{{ .Release.Namespace }}" connectorVolume: storageClass: "default-sc" permission: "ReadWriteMany" @@ -305,6 +308,8 @@ alfresco-deployment-service: value: "{{ .Values.environment.apiUrl }}" - name: ENVIRONMENT_API_TOKEN value: "{{ .Values.environment.apiToken }}" + - name: ENVIRONMENT_NAMESPACE + value: "{{ tpl .Values.environment.namespace . }}" - name: PROJECT_RELEASE_VOLUME_STORAGE_CLASS value: "{{ .Values.connectorVolume.storageClass }}" - name: PROJECT_RELEASE_VOLUME_PERMISSION