diff --git a/helm/acs-sso-example/Chart.lock b/helm/acs-sso-example/Chart.lock index 1ce4e4b81..4f6b30ceb 100644 --- a/helm/acs-sso-example/Chart.lock +++ b/helm/acs-sso-example/Chart.lock @@ -14,8 +14,8 @@ dependencies: - name: alfresco-share repository: https://alfresco.github.io/alfresco-helm-charts/ version: 0.3.0 -- name: common - repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.2.0 -digest: sha256:ace366990857f02b8ea2848d2f7ac9c6fa7825e5b0176dc061bcd35e623ac318 -generated: "2024-01-25T23:34:16.851973+01:00" +- name: alfresco-adf-app + repository: https://alfresco.github.io/alfresco-helm-charts/ + version: 0.1.0-alpha.1 +digest: sha256:4f1a6344f79edcc99f5698d72d36cd9b00cf62ba279ce2ecccbe6fb6fea684c0 +generated: "2024-02-29T10:43:30.610971+01:00" diff --git a/helm/acs-sso-example/Chart.yaml b/helm/acs-sso-example/Chart.yaml index 95b6c27d8..9fb183533 100644 --- a/helm/acs-sso-example/Chart.yaml +++ b/helm/acs-sso-example/Chart.yaml @@ -43,8 +43,8 @@ dependencies: - name: alfresco-share repository: https://alfresco.github.io/alfresco-helm-charts/ version: 0.3.0 - - name: common + - name: alfresco-adf-app alias: alfresco-content-app - repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.2.0 + repository: https://alfresco.github.io/alfresco-helm-charts/ + version: 0.1.0-alpha.1 icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4 diff --git a/helm/acs-sso-example/README.md b/helm/acs-sso-example/README.md index 0d4907590..32b12b905 100644 --- a/helm/acs-sso-example/README.md +++ b/helm/acs-sso-example/README.md @@ -31,8 +31,8 @@ deployment is destroyed or rolled back! | Repository | Name | Version | |------------|------|---------| -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-content-app(common) | 8.2.0 | | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.4.1 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-content-app(alfresco-adf-app) | 0.1.0-alpha.1 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.1.3 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-share | 0.3.0 | | https://codecentric.github.io/helm-charts | keycloakx | 2.3.0 | diff --git a/helm/acs-sso-example/docs/sso-guide.md b/helm/acs-sso-example/docs/sso-guide.md index 97ec59359..dcd0d22cc 100644 --- a/helm/acs-sso-example/docs/sso-guide.md +++ b/helm/acs-sso-example/docs/sso-guide.md @@ -437,7 +437,6 @@ alfresco-content-app: env: APP_CONFIG_PROVIDER: ECM APP_CONFIG_AUTH_TYPE: OAUTH - API_URL: "{protocol}//{hostname}{:port}" APP_CONFIG_OAUTH2_HOST: "{protocol}//{hostname}{:port}/auth/realms/alfresco" APP_CONFIG_OAUTH2_CLIENTID: alfresco APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI: "{protocol}//{hostname}{:port}/assets/silent-refresh.html" diff --git a/helm/acs-sso-example/values.yaml b/helm/acs-sso-example/values.yaml index 6348222ae..05aa4fe36 100644 --- a/helm/acs-sso-example/values.yaml +++ b/helm/acs-sso-example/values.yaml @@ -223,12 +223,8 @@ alfresco-share: alfresco-content-app: nameOverride: alfresco-content-app enabled: true - service: - envType: frontend ingress: - ingressClassName: nginx - hostName: localhost - path: /workspace + className: nginx annotations: nginx.ingress.kubernetes.io/proxy-body-size: 5g nginx.ingress.kubernetes.io/proxy-buffer-size: 8k @@ -240,21 +236,7 @@ alfresco-content-app: env: APP_CONFIG_PROVIDER: ECM APP_CONFIG_AUTH_TYPE: OAUTH - API_URL: "{protocol}//{hostname}{:port}" APP_CONFIG_OAUTH2_HOST: "{protocol}//{hostname}{:port}/auth/realms/alfresco" APP_CONFIG_OAUTH2_CLIENTID: alfresco APP_CONFIG_OAUTH2_REDIRECT_SILENT_IFRAME_URI: "{protocol}//{hostname}{:port}/assets/silent-refresh.html" - securityContext: - runAsNonRoot: true - runAsUser: 101 - capabilities: - drop: - - NET_RAW - - ALL - resources: - requests: - cpu: "0.25" - memory: "256Mi" - limits: - cpu: "1" - memory: "1024Mi" + BASE_PATH: / diff --git a/helm/alfresco-content-services/Chart.lock b/helm/alfresco-content-services/Chart.lock index 8528cfae4..8c076a95c 100644 --- a/helm/alfresco-content-services/Chart.lock +++ b/helm/alfresco-content-services/Chart.lock @@ -8,12 +8,12 @@ dependencies: - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts version: 12.8.5 -- name: common - repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.2.0 -- name: common - repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.2.0 +- name: alfresco-adf-app + repository: https://alfresco.github.io/alfresco-helm-charts/ + version: 0.1.0-alpha.1 +- name: alfresco-adf-app + repository: https://alfresco.github.io/alfresco-helm-charts/ + version: 0.1.0-alpha.1 - name: alfresco-repository repository: https://alfresco.github.io/alfresco-helm-charts/ version: 0.3.1 @@ -47,5 +47,5 @@ dependencies: - name: elasticsearch repository: https://helm.elastic.co version: 7.17.3 -digest: sha256:b2dcda33328757b71e6e5b175741472a69da7a19dc3fa601f1893a73c4577671 -generated: "2024-02-26T10:05:13.733896+01:00" +digest: sha256:1d845c85e537427411a71a8934735c22c0ff3b56f9c0a54788f6c2a0cbeceef9 +generated: "2024-02-28T12:17:51.426045+01:00" diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index 8e613214c..f175f57d9 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -28,16 +28,16 @@ dependencies: repository: oci://registry-1.docker.io/bitnamicharts alias: postgresql-sync condition: postgresql-sync.enabled - - name: common + - name: alfresco-adf-app alias: alfresco-control-center - repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.2.0 + repository: https://alfresco.github.io/alfresco-helm-charts/ + version: 0.1.0-alpha.1 condition: >- alfresco-control-center.enabled - - name: common + - name: alfresco-adf-app alias: alfresco-digital-workspace - repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 8.2.0 + repository: https://alfresco.github.io/alfresco-helm-charts/ + version: 0.1.0-alpha.1 condition: >- alfresco-digital-workspace.enabled - name: alfresco-repository diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 9a4a426fc..00144119b 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -16,9 +16,9 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | Repository | Name | Version | |------------|------|---------| -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-control-center(common) | 8.2.0 | -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-digital-workspace(common) | 8.2.0 | | https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.5.2 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-control-center(alfresco-adf-app) | 0.1.0-alpha.1 | +| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-digital-workspace(alfresco-adf-app) | 0.1.0-alpha.1 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-ai-transformer | 1.1.1 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.1.1 | | https://alfresco.github.io/alfresco-helm-charts/ | alfresco-connector-ms365 | 0.6.1 | @@ -45,7 +45,6 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | activemq.image.repository | string | `"quay.io/alfresco/alfresco-activemq"` | | | activemq.image.tag | string | `"5.18.3-jre17-rockylinux8"` | | | activemq.nameOverride | string | `"activemq"` | | -| activemq.nodeSelector | object | `{}` | Possibility to choose Node for pod, with a key-value pair label e.g {"kubernetes.io/hostname": multinode-demo-m02} | | alfresco-ai-transformer.enabled | bool | `false` | toggle deploying Alfresco ai transformer for more details about configuration check https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-ai-transformer | | alfresco-ai-transformer.fullnameOverride | string | `"alfresco-intelligence-service"` | Enforce static resource naming in AIS so the ATS trouter can be given the URL of the service | | alfresco-ai-transformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | | @@ -64,50 +63,29 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-connector-msteams.image.repository | string | `"quay.io/alfresco/alfresco-ms-teams-service"` | | | alfresco-connector-msteams.image.tag | string | `"2.0.0"` | | | alfresco-control-center.enabled | bool | `true` | | -| alfresco-control-center.env.API_URL | string | `"{protocol}//{hostname}{:port}"` | | | alfresco-control-center.env.APP_CONFIG_AUTH_TYPE | string | `"BASIC"` | | | alfresco-control-center.env.APP_CONFIG_PROVIDER | string | `"ECM"` | | +| alfresco-control-center.env.BASE_PATH | string | `"/control-center"` | | | alfresco-control-center.image.pullPolicy | string | `"IfNotPresent"` | | | alfresco-control-center.image.repository | string | `"quay.io/alfresco/alfresco-control-center"` | | | alfresco-control-center.image.tag | string | `"8.3.0"` | | -| alfresco-control-center.ingress.annotations."kubernetes.io/ingress.class" | string | `"nginx"` | | -| alfresco-control-center.ingress.path | string | `"/control-center"` | | +| alfresco-control-center.ingress.annotations."nginx.ingress.kubernetes.io/proxy-body-size" | string | `"5g"` | | +| alfresco-control-center.ingress.hosts[0].paths[0].path | string | `"/control-center"` | | +| alfresco-control-center.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` | | | alfresco-control-center.ingress.tls | list | `[]` | | | alfresco-control-center.nameOverride | string | `"alfresco-cc"` | | -| alfresco-control-center.nodeSelector | object | `{}` | | -| alfresco-control-center.registryPullSecrets[0] | string | `"{{ $.Values.global.alfrescoRegistryPullSecrets }}"` | | -| alfresco-control-center.resources.limits.cpu | string | `"1"` | | -| alfresco-control-center.resources.limits.memory | string | `"512Mi"` | | -| alfresco-control-center.resources.requests.cpu | string | `"0.1"` | | -| alfresco-control-center.resources.requests.memory | string | `"128Mi"` | | -| alfresco-control-center.securityContext.capabilities.drop[0] | string | `"NET_RAW"` | | -| alfresco-control-center.securityContext.capabilities.drop[1] | string | `"ALL"` | | -| alfresco-control-center.securityContext.runAsNonRoot | bool | `true` | | -| alfresco-control-center.securityContext.runAsUser | int | `101` | | -| alfresco-control-center.service.envType | string | `"frontend"` | | | alfresco-digital-workspace.enabled | bool | `true` | | -| alfresco-digital-workspace.env.API_URL | string | `"{protocol}//{hostname}{:port}"` | | | alfresco-digital-workspace.env.APP_CONFIG_AUTH_TYPE | string | `"BASIC"` | | | alfresco-digital-workspace.env.APP_CONFIG_PROVIDER | string | `"ECM"` | | +| alfresco-digital-workspace.env.BASE_PATH | string | `"/workspace"` | | | alfresco-digital-workspace.image.pullPolicy | string | `"IfNotPresent"` | | | alfresco-digital-workspace.image.repository | string | `"quay.io/alfresco/alfresco-digital-workspace"` | | | alfresco-digital-workspace.image.tag | string | `"4.3.0"` | | -| alfresco-digital-workspace.ingress.annotations."kubernetes.io/ingress.class" | string | `"nginx"` | | | alfresco-digital-workspace.ingress.annotations."nginx.ingress.kubernetes.io/proxy-body-size" | string | `"5g"` | | -| alfresco-digital-workspace.ingress.path | string | `"/workspace"` | | +| alfresco-digital-workspace.ingress.hosts[0].paths[0].path | string | `"/workspace"` | | +| alfresco-digital-workspace.ingress.hosts[0].paths[0].pathType | string | `"Prefix"` | | | alfresco-digital-workspace.ingress.tls | list | `[]` | | | alfresco-digital-workspace.nameOverride | string | `"alfresco-dw"` | | -| alfresco-digital-workspace.nodeSelector | object | `{}` | | -| alfresco-digital-workspace.registryPullSecrets[0] | string | `"{{ $.Values.global.alfrescoRegistryPullSecrets }}"` | | -| alfresco-digital-workspace.resources.limits.cpu | string | `"1"` | | -| alfresco-digital-workspace.resources.limits.memory | string | `"512Mi"` | | -| alfresco-digital-workspace.resources.requests.cpu | string | `"0.1"` | | -| alfresco-digital-workspace.resources.requests.memory | string | `"128Mi"` | | -| alfresco-digital-workspace.securityContext.capabilities.drop[0] | string | `"NET_RAW"` | | -| alfresco-digital-workspace.securityContext.capabilities.drop[1] | string | `"ALL"` | | -| alfresco-digital-workspace.securityContext.runAsNonRoot | bool | `true` | | -| alfresco-digital-workspace.securityContext.runAsUser | int | `101` | | -| alfresco-digital-workspace.service.envType | string | `"frontend"` | | | alfresco-repository.configuration.db.existingConfigMap.name | string | `"alfresco-infrastructure"` | | | alfresco-repository.configuration.db.existingSecret.name | string | `"alfresco-cs-database"` | | | alfresco-repository.configuration.messageBroker.existingConfigMap.name | string | `"alfresco-infrastructure"` | | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 62923255d..3ec9f7561 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -160,9 +160,6 @@ activemq: tag: 5.18.3-jre17-rockylinux8 nameOverride: activemq enabled: true - # -- Possibility to choose Node for pod, with a key-value pair label - # e.g {"kubernetes.io/hostname": multinode-demo-m02} - nodeSelector: {} adminUser: # -- Default username for the embedded broker admin user user: admin @@ -357,82 +354,43 @@ alfresco-search-enterprise: image: tag: 4.0.0.1 alfresco-digital-workspace: - nodeSelector: {} enabled: true nameOverride: "alfresco-dw" - service: - envType: frontend ingress: - path: /workspace annotations: - kubernetes.io/ingress.class: nginx nginx.ingress.kubernetes.io/proxy-body-size: "5g" tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + hosts: + - paths: + - path: /workspace + pathType: Prefix image: repository: quay.io/alfresco/alfresco-digital-workspace tag: 4.3.0 pullPolicy: IfNotPresent - registryPullSecrets: - - "{{ $.Values.global.alfrescoRegistryPullSecrets }}" env: APP_CONFIG_PROVIDER: "ECM" APP_CONFIG_AUTH_TYPE: "BASIC" - API_URL: "{protocol}//{hostname}{:port}" - securityContext: - runAsNonRoot: true - runAsUser: 101 - capabilities: - drop: - - NET_RAW - - ALL - resources: - requests: - cpu: "0.1" - memory: "128Mi" - limits: - cpu: "1" - memory: "512Mi" + BASE_PATH: /workspace alfresco-control-center: - nodeSelector: {} enabled: true nameOverride: "alfresco-cc" - service: - envType: frontend ingress: - path: /control-center annotations: - kubernetes.io/ingress.class: nginx + nginx.ingress.kubernetes.io/proxy-body-size: "5g" tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + hosts: + - paths: + - path: /control-center + pathType: Prefix image: repository: quay.io/alfresco/alfresco-control-center tag: 8.3.0 pullPolicy: IfNotPresent - registryPullSecrets: - - "{{ $.Values.global.alfrescoRegistryPullSecrets }}" env: APP_CONFIG_PROVIDER: "ECM" APP_CONFIG_AUTH_TYPE: "BASIC" - API_URL: "{protocol}//{hostname}{:port}" - securityContext: - runAsNonRoot: true - runAsUser: 101 - capabilities: - drop: - - NET_RAW - - ALL - resources: - requests: - cpu: "0.1" - memory: "128Mi" - limits: - cpu: "1" - memory: "512Mi" + BASE_PATH: /control-center postgresql: # -- Toggle embedded postgres for Alfresco Content Services repository # Check [PostgreSQL Bitnami chart