From be35c2deaad421e9a55b671302d8979eeac065ed Mon Sep 17 00:00:00 2001 From: Utkarsh Date: Wed, 1 Feb 2023 13:30:32 +0530 Subject: [PATCH 1/7] OPSEXP-1353 Removed Alfresco Sync service HPA chart --- .../templates/hpa-syncservice.yaml | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100755 helm/alfresco-content-services/charts/alfresco-sync-service/templates/hpa-syncservice.yaml diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/templates/hpa-syncservice.yaml b/helm/alfresco-content-services/charts/alfresco-sync-service/templates/hpa-syncservice.yaml deleted file mode 100755 index 33fbe66f8..000000000 --- a/helm/alfresco-content-services/charts/alfresco-sync-service/templates/hpa-syncservice.yaml +++ /dev/null @@ -1,33 +0,0 @@ -{{- if .Values.syncservice.enabled }} -{{- if .Values.syncservice.horizontalPodAutoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ template "syncservice.fullname" . }}-hpa - labels: - heritage: {{ .Release.Service }} - release: {{ .Release.Name }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - component: syncservice -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ template "syncservice.fullname" . }} - minReplicas: {{ .Values.syncservice.horizontalPodAutoscaling.minReplicas }} - maxReplicas: {{ .Values.syncservice.horizontalPodAutoscaling.maxReplicas }} - metrics: - {{- if .Values.syncservice.horizontalPodAutoscaling.CPU.enabled }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.syncservice.horizontalPodAutoscaling.CPU.targetAverageUtilization }} - {{- end }} - {{- if .Values.syncservice.horizontalPodAutoscaling.memory.enabled }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.syncservice.horizontalPodAutoscaling.memory.targetAverageUtilization }} - {{- end }} -{{- end }} -{{- end }} From 3ba5e0c63d47346b0b1706455111e28553aefef3 Mon Sep 17 00:00:00 2001 From: Utkarsh Date: Wed, 1 Feb 2023 16:25:30 +0530 Subject: [PATCH 2/7] removed sync service enabled from values.yaml --- helm/alfresco-content-services/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 19cf27421..5e57dfcaa 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -955,8 +955,6 @@ metadataKeystore: alfresco-sync-service: messageBroker: *acs_messageBroker nodeSelector: {} - syncservice: - enabled: true image: repository: quay.io/alfresco/service-sync tag: 3.8.0 From 2fd6f043c8e06ad506b0f5af56499180c73a21da Mon Sep 17 00:00:00 2001 From: Utkarsh Date: Wed, 1 Feb 2023 17:43:49 +0530 Subject: [PATCH 3/7] fixed helm docs pre-commit --- helm/alfresco-content-services/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index c79e94fc6..e63be4aaf 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -135,7 +135,6 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-sync-service.messageBroker.url | string | `nil` | | | alfresco-sync-service.messageBroker.user | string | `nil` | | | alfresco-sync-service.nodeSelector | object | `{}` | | -| alfresco-sync-service.syncservice.enabled | bool | `true` | | | apiexplorer | object | `{"ingress":{"path":"/api-explorer"}}` | Declares the api-explorer service used by the content repository | | database.driver | string | `nil` | Postgresql jdbc driver name ex: org.postgresql.Driver. It should be available in the container image. | | database.existingSecretName | string | `nil` | An existing secret that contains DATABASE_USERNAME and DATABASE_PASSWORD keys. When using embedded postgres you need to also set `postgresql.existingSecret`. | From 73d1cf2ee9488e66006e693859a63709caa8a929 Mon Sep 17 00:00:00 2001 From: Utkarsh Date: Thu, 2 Feb 2023 12:20:07 +0530 Subject: [PATCH 4/7] Removed sync service values HPA parameters --- .../charts/alfresco-sync-service/values.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml b/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml index ee165fb09..b33cc937b 100755 --- a/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml +++ b/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml @@ -15,7 +15,6 @@ podSecurityContext: runAsNonRoot: true fsGroup: 1000 syncservice: - enabled: true image: repository: quay.io/alfresco/service-sync tag: 4.0.0-M5 @@ -50,23 +49,6 @@ syncservice: periodSeconds: 10 failureThreshold: 12 timeoutSeconds: 10 - horizontalPodAutoscaling: - enabled: true - minReplicas: 1 - maxReplicas: 3 - CPU: - enabled: true - targetAverageUtilization: 80 - memory: - enabled: true - # -- For the memory a lower threshold(60) for the targetAverageUtilization - # is needed. We need to allow the resource metrics to be queried by the - # metrics-server, before the pod is killed # by Kubernetes due to reaching - # memory limits(the infamous message one might see in the pod events - # history "Terminated: OOMKilled"). - # The metrics are checked every 15 seconds by default, configured by the - # global cluster flag --horizontal-pod-autoscaler-sync-period - targetAverageUtilization: 60 repository: host: alfresco-cs-repository port: 80 From be44681d82ee13e63722087320cac8dbaaba3720 Mon Sep 17 00:00:00 2001 From: Utkarsh Date: Thu, 2 Feb 2023 12:21:05 +0530 Subject: [PATCH 5/7] added sync service enabled in main values file --- helm/alfresco-content-services/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 5e57dfcaa..19cf27421 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -955,6 +955,8 @@ metadataKeystore: alfresco-sync-service: messageBroker: *acs_messageBroker nodeSelector: {} + syncservice: + enabled: true image: repository: quay.io/alfresco/service-sync tag: 3.8.0 From e6b7f31f89402cf5dd611c5e1a0b9197fa798451 Mon Sep 17 00:00:00 2001 From: Utkarsh Date: Thu, 2 Feb 2023 12:27:15 +0530 Subject: [PATCH 6/7] Fixed Helm Pre-commit docs --- helm/alfresco-content-services/README.md | 1 + .../charts/alfresco-sync-service/README.md | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index e63be4aaf..c79e94fc6 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -135,6 +135,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-sync-service.messageBroker.url | string | `nil` | | | alfresco-sync-service.messageBroker.user | string | `nil` | | | alfresco-sync-service.nodeSelector | object | `{}` | | +| alfresco-sync-service.syncservice.enabled | bool | `true` | | | apiexplorer | object | `{"ingress":{"path":"/api-explorer"}}` | Declares the api-explorer service used by the content repository | | database.driver | string | `nil` | Postgresql jdbc driver name ex: org.postgresql.Driver. It should be available in the container image. | | database.existingSecretName | string | `nil` | An existing secret that contains DATABASE_USERNAME and DATABASE_PASSWORD keys. When using embedded postgres you need to also set `postgresql.existingSecret`. | diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/README.md b/helm/alfresco-content-services/charts/alfresco-sync-service/README.md index 8f3681f49..8d501cd2a 100644 --- a/helm/alfresco-content-services/charts/alfresco-sync-service/README.md +++ b/helm/alfresco-content-services/charts/alfresco-sync-service/README.md @@ -59,16 +59,8 @@ Alfresco Sync Service | replicaCount | int | `1` | | | repository.host | string | `"alfresco-cs-repository"` | | | repository.port | int | `80` | | -| syncservice.enabled | bool | `true` | | | syncservice.environment.EXTRA_JAVA_OPTS | string | `""` | | | syncservice.environment.JAVA_OPTS | string | `"-Dsync.metrics.reporter.graphite.enabled=false -Dsync.metrics.reporter.graphite.address=127.0.0.1 -Dsync.metrics.reporter.graphite.port=2003 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"` | | -| syncservice.horizontalPodAutoscaling.CPU.enabled | bool | `true` | | -| syncservice.horizontalPodAutoscaling.CPU.targetAverageUtilization | int | `80` | | -| syncservice.horizontalPodAutoscaling.enabled | bool | `true` | | -| syncservice.horizontalPodAutoscaling.maxReplicas | int | `3` | | -| syncservice.horizontalPodAutoscaling.memory.enabled | bool | `true` | | -| syncservice.horizontalPodAutoscaling.memory.targetAverageUtilization | int | `60` | For the memory a lower threshold(60) for the targetAverageUtilization is needed. We need to allow the resource metrics to be queried by the metrics-server, before the pod is killed # by Kubernetes due to reaching memory limits(the infamous message one might see in the pod events history "Terminated: OOMKilled"). The metrics are checked every 15 seconds by default, configured by the global cluster flag --horizontal-pod-autoscaler-sync-period | -| syncservice.horizontalPodAutoscaling.minReplicas | int | `1` | | | syncservice.image.internalPort | int | `9090` | | | syncservice.image.pullPolicy | string | `"IfNotPresent"` | | | syncservice.image.repository | string | `"quay.io/alfresco/service-sync"` | | From 4a3cb2d5c06cef06bd164e68b08248ff9e7af05c Mon Sep 17 00:00:00 2001 From: Utkarsh Date: Thu, 2 Feb 2023 22:45:51 +0530 Subject: [PATCH 7/7] Revert syncservice: enabled in values file for deployment --- .../charts/alfresco-sync-service/README.md | 1 + .../charts/alfresco-sync-service/values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/README.md b/helm/alfresco-content-services/charts/alfresco-sync-service/README.md index 8d501cd2a..1f06be6b9 100644 --- a/helm/alfresco-content-services/charts/alfresco-sync-service/README.md +++ b/helm/alfresco-content-services/charts/alfresco-sync-service/README.md @@ -59,6 +59,7 @@ Alfresco Sync Service | replicaCount | int | `1` | | | repository.host | string | `"alfresco-cs-repository"` | | | repository.port | int | `80` | | +| syncservice.enabled | bool | `true` | | | syncservice.environment.EXTRA_JAVA_OPTS | string | `""` | | | syncservice.environment.JAVA_OPTS | string | `"-Dsync.metrics.reporter.graphite.enabled=false -Dsync.metrics.reporter.graphite.address=127.0.0.1 -Dsync.metrics.reporter.graphite.port=2003 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"` | | | syncservice.image.internalPort | int | `9090` | | diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml b/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml index b33cc937b..24deb224c 100755 --- a/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml +++ b/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml @@ -15,6 +15,7 @@ podSecurityContext: runAsNonRoot: true fsGroup: 1000 syncservice: + enabled: true image: repository: quay.io/alfresco/service-sync tag: 4.0.0-M5