Merge pull request #34 from xenit-eu/XM2C-55

XM2C-55 Change from replicaCount to replicas
xenit-eu · Nov 2, 2022 · e3e7646 · e3e7646
2 parents d99de66 + 2f1e2d5
commit e3e7646
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,3 +12,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 [XM2C-54]
 * Rename all `image.repository` properties to `image`
 * Rename all `image.pullPolicy` properties to `imagePullPolicy`
+
+[XM2C-55]
+* Rename all `replicaCount` properties to `replicas`
diff --git a/README.md b/README.md
@@ -240,7 +240,7 @@ For more information take a look at
 * Description: used to add more path to ingress under the same host name for new services
 ### ACS
 
-#### `acs.replicaCount`
+#### `acs.replicas`
 
 * Required: false
 * Default: `2`
@@ -412,7 +412,7 @@ For more information take a look at
 * Default: `true`
 * Description: Enable or disable the digital workspace
 
-#### `digitalWorkspace.replicaCount`
+#### `digitalWorkspace.replicas`
 
 * Required: false
 * Default: `1`
@@ -495,7 +495,7 @@ For more information take a look at
 * Default: `true`
 * Description: Enable or disable the share
 
-#### `share.replicaCount`
+#### `share.replicas`
 
 * Required: false
 * Default: `1`
@@ -586,7 +586,7 @@ For more information take a look at
 * Default: `true`
 * Description: Enable or disable the Active MQ
 
-#### `mq.replicaCount`
+#### `mq.replicas`
 
 * Required: false
 * Default: `1`
@@ -663,7 +663,7 @@ For more information take a look at
 * Default: `true`
 * Description: Enable or disable the PostgresQl
 
-#### `postgresql.replicaCount`
+#### `postgresql.replicas`
 
 * Required: false
 * Default: `1`
@@ -740,7 +740,7 @@ For more information take a look at
 * Default: `true`
 * Description: Enable or disable the Solr
 
-#### `solr.replicaCount`
+#### `solr.replicas`
 
 * Required: false
 * Default: `2`
@@ -819,7 +819,7 @@ For more information take a look at
 
 ### Shared File Store
 
-#### `transformServices.sharedFileStore.replicaCount`
+#### `transformServices.sharedFileStore.replicas`
 
 * Required: false
 * Default: `1`
@@ -890,7 +890,7 @@ For more information take a look at
 
 ### Transform Core All In One
 
-#### `transformServices.transformCoreAio.replicaCount`
+#### `transformServices.transformCoreAio.replicas`
 
 * Required: false
 * Default: `1`
@@ -961,7 +961,7 @@ For more information take a look at
 
 ### Transform Router
 
-#### `transformServices.transformRouter.replicaCount`
+#### `transformServices.transformRouter.replicas`
 
 * Required: false
 * Default: `1`
@@ -1038,7 +1038,7 @@ For more information take a look at
 * Default: `true`
 * Description: Enable or disable the Sync Service
 
-#### `syncService.replicaCount`
+#### `syncService.replicas`
 
 * Required: false
 * Default: `1`
@@ -1115,7 +1115,7 @@ For more information take a look at
 * Default: `false`
 * Description: Enable or disable the Office Online Integration
 
-#### `ooi.replicaCount`
+#### `ooi.replicas`
 
 * Required: false
 * Default: `1`

diff --git a/integration-testing/src/test/java/eu/xenit/testing/k8s/kind/HelmAlfrescoTest.java b/integration-testing/src/test/java/eu/xenit/testing/k8s/kind/HelmAlfrescoTest.java
@@ -44,7 +44,7 @@ void smallSetup() throws IOException {
                     username: hello
                     password: world
                 acs:
-                  replicaCount: 1
+                  replicas: 1
                   resources:
                     requests:
                       memory: "2Gi"

diff --git a/xenit-alfresco/templates/acs/acs-config.yaml b/xenit-alfresco/templates/acs/acs-config.yaml
@@ -21,7 +21,7 @@ data:
   {{- if .Values.mq.enabled }}
   GLOBAL_messaging.broker.url: 'failover:(nio://mq-service:61616)?timeout=3000&jms.useCompression=true'
   {{- end }}
-  {{- if gt .Values.acs.replicaCount 1.0 }}
+  {{- if gt .Values.acs.replicas 1.0 }}
   GLOBAL_alfresco.cluster.enabled: 'true'
   {{- end }}
   {{- if .Values.transformServices.enabled }}

diff --git a/xenit-alfresco/templates/acs/acs-deployment.yaml b/xenit-alfresco/templates/acs/acs-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: acs
 spec:
-  replicas: {{ .Values.acs.replicaCount }}
+  replicas: {{ .Values.acs.replicas }}
   selector:
     matchLabels:
       app: acs

diff --git a/xenit-alfresco/templates/active-mq/mq-deployement.yaml b/xenit-alfresco/templates/active-mq/mq-deployement.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: mq
 spec:
-  replicas: {{ .Values.mq.replicaCount }}
+  replicas: {{ .Values.mq.replicas }}
   selector:
     matchLabels:
       app: mq

diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: digital-workspace
 spec:
-  replicas: {{ .Values.digitalWorkspace.replicaCount }}
+  replicas: {{ .Values.digitalWorkspace.replicas }}
   selector:
     matchLabels:
       app: digital-workspace

diff --git a/xenit-alfresco/templates/ooi/ooi-deployment.yaml b/xenit-alfresco/templates/ooi/ooi-deployment.yaml
@@ -12,7 +12,7 @@ metadata:
   labels:
     app: ooi
 spec:
-  replicas: {{ .Values.ooi.replicaCount }}
+  replicas: {{ .Values.ooi.replicas }}
   selector:
     matchLabels:
       app: ooi

diff --git a/xenit-alfresco/templates/share/share-deployment.yaml b/xenit-alfresco/templates/share/share-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: share
 spec:
-  replicas: {{ .Values.share.replicaCount }}
+  replicas: {{ .Values.share.replicas }}
   selector:
     matchLabels:
       app: share

diff --git a/xenit-alfresco/templates/solr/solr-config.yaml b/xenit-alfresco/templates/solr/solr-config.yaml
@@ -8,7 +8,7 @@ metadata:
     app: solr
 data:
   ALFRESCO_HOST: 'acs-service'
-  {{- if gt .Values.solr.replicaCount 1.0 }}
+  {{- if gt .Values.solr.replicas 1.0 }}
   SHARDING.cluster.enabled: 'true'
   {{- end }}
   {{- if .Values.solr.additionalEnvironmentVariables }}

diff --git a/xenit-alfresco/templates/solr/solr-stateful-set.yaml b/xenit-alfresco/templates/solr/solr-stateful-set.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: solr
 spec:
-  replicas: {{ .Values.solr.replicaCount }}
+  replicas: {{ .Values.solr.replicas }}
   selector:
     matchLabels:
       app: solr

diff --git a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml b/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: sync-service
 spec:
-  replicas: {{ .Values.syncService.replicaCount }}
+  replicas: {{ .Values.syncService.replicas }}
   selector:
     matchLabels:
       app: sync-service

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
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: shared-file-store
 spec:
-  replicas: {{ .Values.transformServices.sharedFileStore.replicaCount }}
+  replicas: {{ .Values.transformServices.sharedFileStore.replicas }}
   selector:
     matchLabels:
       app: shared-file-store

diff --git a/...fresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml b/...fresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: transform-core-aio
 spec:
-  replicas: {{ .Values.transformServices.transformCoreAio.replicaCount }}
+  replicas: {{ .Values.transformServices.transformCoreAio.replicas }}
   selector:
     matchLabels:
       app: transform-core-aio

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
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: transform-router
 spec:
-  replicas: {{ .Values.transformServices.transformRouter.replicaCount }}
+  replicas: {{ .Values.transformServices.transformRouter.replicas }}
   selector:
     matchLabels:
       app: transform-router

diff --git a/xenit-alfresco/values.yaml b/xenit-alfresco/values.yaml
@@ -25,7 +25,7 @@ ingress:
     cert-manager.io/cluster-issuer: "letsencrypt-production"
 
 acs:
-  replicaCount: 1
+  replicas: 1
   image: 'xenit/alfresco-repository-community:7.2.0'
   strategy:
     type: RollingUpdate
@@ -52,7 +52,7 @@ acs:
 
 digitalWorkspace:
   enabled: true
-  replicaCount: 1
+  replicas: 1
   image: 'quay.io/alfresco/alfresco-digital-workspace:2.4.2-adw'
   strategy:
     type: RollingUpdate
@@ -64,7 +64,7 @@ digitalWorkspace:
 
 share:
   enabled: true
-  replicaCount: 1
+  replicas: 1
   image: 'xenit/alfresco-share-community:7.0'
   strategy:
     type: RollingUpdate
@@ -75,7 +75,7 @@ share:
 
 mq:
   enabled: true
-  replicaCount: 1
+  replicas: 1
   image: 'alfresco/alfresco-activemq:5.16.1'
   strategy:
     type: Recreate
@@ -96,7 +96,7 @@ postgresql:
 
 solr:
   enabled: true
-  replicaCount: 2
+  replicas: 2
   image: 'hub.xenit.eu/alfresco-enterprise/alfresco-solr6:2.0.2'
   strategy:
     type: RollingUpdate
@@ -108,7 +108,7 @@ solr:
 transformServices:
   enabled: true
   sharedFileStore:
-    replicaCount: 1
+    replicas: 1
     image: 'quay.io/alfresco/alfresco-shared-file-store:0.16.0'
     strategy:
       type: RollingUpdate
@@ -117,7 +117,7 @@ transformServices:
         memory: "512Mi"
         cpu: "200m"
   transformCoreAio:
-    replicaCount: 1
+    replicas: 1
     image: 'alfresco/alfresco-transform-core-aio'
     strategy:
       type: RollingUpdate
@@ -126,7 +126,7 @@ transformServices:
         memory: "256Mi"
         cpu: "150m"
   transformRouter:
-    replicaCount: 1
+    replicas: 1
     image: 'quay.io/alfresco/alfresco-transform-router:1.5.2'
     strategy:
       type: RollingUpdate
@@ -137,7 +137,7 @@ transformServices:
 
 syncService:
   enabled: false
-  replicaCount: 1
+  replicas: 1
   image: 'quay.io/alfresco/service-sync:3.4.0'
   strategy:
     type: RollingUpdate
@@ -148,7 +148,7 @@ syncService:
 
 ooi:
   enabled: false
-  replicaCount: 1
+  replicas: 1
   image: 'quay.io/alfresco/alfresco-ooi-service:1.1.2'
   strategy:
     type: RollingUpdate