Merge pull request #157 from xenit-eu/XENOPS-1187

XENOPS-1187 flag to enable/disable Enterprise features
xenit-eu · Aug 8, 2024 · 015034a · 015034a
2 parents ee031b5 + 3a06728
commit 015034a
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 chronology things are added/fixed/changed and - where possible - links to the PRs involved.
 
 ### Changes
+[v0.7.1]
+* add flag to enable/disable enterprise-only functionality
+* remove HorizontalPodAutoscaler as it was not functional
+* set postgresql default strategy to Recreate
+
 [v0.7.0]
-* rename blocked solr path to blocked paths 
+* rename blocked solr path to blocked paths
 * split default backend and default path
 
 [v0.6.9]

diff --git a/README.md b/README.md
@@ -105,6 +105,15 @@ For more information take a look at
 
 ### General
 
+#### `general.enterprise`
+
+* Required: false
+* Default: true
+* Description: Whether this is an enterprise version of Alfresco. In a community version Transform Service Router, 
+Transform Service Shared File Storage, Clustering (replica count should always have a max of 1 for ACS pods), MQ and 
+Digital Workspace are disabled. 
+
+
 #### `general.strategy`
 
 * Required: false
@@ -486,48 +495,6 @@ For more information take a look at
 * Default: None
 * Description: The maximum resources a pod may consume from a node
 
-#### `acs.hpa.enabled`
-
-* Required: false
-* Default: false
-* Description: Whether the ACS deployment should autoscale
-
-#### `acs.hpa.minReplicas`
-
-* Required: false
-* Default: 1
-* Description: The min ammount of replicas will run when autoscaling
-
-#### `acs.hpa.maxReplicas`
-
-* Required: false
-* Default: 10
-* Description: The max ammount of replicas will run when autoscaling
-
-#### `acs.hpa.cpu.enabled`
-
-* Required: false
-* Default: false
-* Description: whether horizontal scaling should trigger on cpu load
-
-#### `acs.hpa.cpu.utilization`
-
-* Required: false
-* Default: 70
-* Description: The CPU cutover percentage
-
-#### `acs.hpa.memory.enabled`
-
-* Required: false
-* Default: true
-* Description: whether horizontal scaling should trigger on memory load
-
-#### `acs.hpa.memory.utilization`
-
-* Required: false
-* Default: 70
-* Description: The Memory cutover percentage
-
 #### `acs.imagePullSecrets`
 
 * Required: false
@@ -1136,7 +1103,7 @@ For more information take a look at
 #### `postgresql.strategy.type`
 
 * Required: false
-* Default: `RollingUpdate`
+* Default: `Recreate`
 * Description: Can be set to `Recreate` if you want all your pods to be killed before new ones are created
 
 #### `postgresql.additionalEnvironmentVariables`

diff --git a/xenit-alfresco/templates/acs/acs-config.yaml b/xenit-alfresco/templates/acs/acs-config.yaml
@@ -24,9 +24,14 @@ data:
   {{- if .Values.mq.enabled }}
   GLOBAL_messaging.broker.url: 'failover:(nio://mq-service:61616)?timeout=3000&jms.useCompression=true'
   {{- end }}
-  {{- if gt .Values.acs.replicas 1.0 }}
+  {{- if and (gt .Values.acs.replicas 1.0)  (.Values.general.enterprise) }}
   GLOBAL_alfresco.cluster.enabled: 'true'
   {{- end }}
+  {{- if not (.Values.general.enterprise) }}
+  GLOBAL_local.transform.service.enabled: 'true'
+  GLOBAL_messaging.subsystem.autoStart: 'false'
+  GLOBAL_repo.event2.enabled: 'false'
+  {{- end}}
   {{- if .Values.transformServices.enabled }}
   GLOBAL_transform.service.enabled: 'true'
   {{- if .Values.transformServices.transformRouter.enabled }}

diff --git a/xenit-alfresco/templates/acs/acs-deployment.yaml b/xenit-alfresco/templates/acs/acs-deployment.yaml
@@ -7,7 +7,11 @@ metadata:
   labels:
     app: acs
 spec:
+  {{- if  .Values.general.enterprise }}
   replicas: {{ .Values.acs.replicas }}
+  {{- else }}
+  replicas: 1
+  {{- end }}
   selector:
     matchLabels:
       app: acs

diff --git a/xenit-alfresco/templates/acs/acs-hpa.yaml b/xenit-alfresco/templates/acs/acs-hpa.yaml
diff --git a/xenit-alfresco/templates/active-mq/mq-config.yaml b/xenit-alfresco/templates/active-mq/mq-config.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.mq.enabled -}}
+{{- if and (.Values.mq.enabled) (.Values.general.enterprise) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/xenit-alfresco/templates/active-mq/mq-deployment.yaml b/xenit-alfresco/templates/active-mq/mq-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.mq.enabled -}}
+{{- if and (.Values.mq.enabled) (.Values.general.enterprise) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/xenit-alfresco/templates/active-mq/mq-secret.yaml b/xenit-alfresco/templates/active-mq/mq-secret.yaml
@@ -1,4 +1,4 @@
-{{- if  and (not .Values.general.secrets.mq.selfManaged) (.Values.mq.enabled) }}
+{{- if  and (not .Values.general.secrets.mq.selfManaged) (.Values.mq.enabled) (.Values.general.enterprise) }}
 {{- $secret_name := "mq-secret" }}
 
 apiVersion: v1

diff --git a/xenit-alfresco/templates/active-mq/mq-service.yaml b/xenit-alfresco/templates/active-mq/mq-service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.mq.enabled -}}
+{{- if and (.Values.mq.enabled) (.Values.general.enterprise) -}}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/xenit-alfresco/templates/active-mq/network-policy.yml b/xenit-alfresco/templates/active-mq/network-policy.yml
@@ -1,4 +1,4 @@
-{{- if and (.Values.general.networkPolicies.enabled) (.Values.mq.enabled) }}
+{{- if and (.Values.general.networkPolicies.enabled) (.Values.mq.enabled) (.Values.general.enterprise) }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-config.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-config.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.digitalWorkspace.enabled -}}
+{{- if and (.Values.digitalWorkspace.enabled) (.Values.general.enterprise) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.digitalWorkspace.enabled -}}
+{{- if and (.Values.digitalWorkspace.enabled) (.Values.general.enterprise) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-service.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.digitalWorkspace.enabled -}}
+{{- if and (.Values.digitalWorkspace.enabled) (.Values.general.enterprise) -}}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/xenit-alfresco/templates/transform-services/shared-file-store/network-policy.yml b/xenit-alfresco/templates/transform-services/shared-file-store/network-policy.yml
@@ -1,4 +1,4 @@
-{{- if and (.Values.transformServices.enabled) (.Values.transformServices.sharedFileStore.enabled) (.Values.general.networkPolicies.enabled)  }}
+{{- if and (.Values.transformServices.enabled) (.Values.transformServices.sharedFileStore.enabled) (.Values.general.networkPolicies.enabled)  (.Values.general.enterprise) }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

diff --git a/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-config.yaml b/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-config.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.transformServices.enabled)  (.Values.transformServices.sharedFileStore.enabled) -}}
+{{- if and (.Values.transformServices.enabled)  (.Values.transformServices.sharedFileStore.enabled) (.Values.general.enterprise) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/...alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml b/...alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.transformServices.enabled) (.Values.transformServices.sharedFileStore.enabled) -}}
+{{- if and (.Values.transformServices.enabled) (.Values.transformServices.sharedFileStore.enabled) (.Values.general.enterprise) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-service.yaml b/xenit-alfresco/templates/transform-services/shared-file-store/shared-file-store-service.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.transformServices.enabled) (.Values.transformServices.sharedFileStore.enabled) -}}
+{{- if and (.Values.transformServices.enabled) (.Values.transformServices.sharedFileStore.enabled) (.Values.general.enterprise) -}}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/xenit-alfresco/templates/transform-services/transform-router/network-policy.yml b/xenit-alfresco/templates/transform-services/transform-router/network-policy.yml
@@ -1,4 +1,4 @@
-{{- if and (.Values.transformServices.enabled) (.Values.transformServices.transformRouter.enabled) (.Values.general.networkPolicies.enabled) }}
+{{- if and (.Values.transformServices.enabled) (.Values.transformServices.transformRouter.enabled) (.Values.general.networkPolicies.enabled) (.Values.general.enterprise) }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

diff --git a/xenit-alfresco/templates/transform-services/transform-router/transform-router-config.yaml b/xenit-alfresco/templates/transform-services/transform-router/transform-router-config.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.transformServices.enabled) (.Values.transformServices.transformRouter.enabled)  -}}
+{{- if and (.Values.transformServices.enabled) (.Values.transformServices.transformRouter.enabled) (.Values.general.enterprise) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/...t-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml b/...t-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.transformServices.enabled) (.Values.transformServices.transformRouter.enabled)  -}}
+{{- if and (.Values.transformServices.enabled) (.Values.transformServices.transformRouter.enabled) (.Values.general.enterprise) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/xenit-alfresco/templates/transform-services/transform-router/transform-router-service.yaml b/xenit-alfresco/templates/transform-services/transform-router/transform-router-service.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.transformServices.enabled) (.Values.transformServices.transformRouter.enabled)  -}}
+{{- if and (.Values.transformServices.enabled) (.Values.transformServices.transformRouter.enabled) (.Values.general.enterprise) -}}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/xenit-alfresco/values.yaml b/xenit-alfresco/values.yaml
@@ -1,4 +1,5 @@
 general:
+  enterprise: true
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -44,16 +45,6 @@ acs:
     requests:
       memory: "2Gi"
       cpu: "2"
-  hpa:
-    enabled: false
-    minReplicas: 1
-    maxReplicas: 10
-    cpu:
-      enabled: false
-      utilization: 70
-    memory:
-      enabled: true
-      utilization: 70
   dbUrl: 'jdbc:postgresql://postgresql-service:5432/alfresco'
   dbDriver: 'org.postgresql.Driver'
   sharePort: '443'
@@ -146,7 +137,7 @@ postgresql:
     repository: 'xenit/postgres'
     tag: 'latest'
   strategy:
-    type: RollingUpdate
+    type: Recreate
   resources:
     requests:
       memory: "1Gi"