diff --git a/templates/analytics/analytics-deployment.yaml b/templates/analytics/analytics-deployment.yaml index ae4167f..b36d6eb 100644 --- a/templates/analytics/analytics-deployment.yaml +++ b/templates/analytics/analytics-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-analytics spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/cas/cas-deployment.yaml b/templates/cas/cas-deployment.yaml index 3049b66..4fa3d13 100644 --- a/templates/cas/cas-deployment.yaml +++ b/templates/cas/cas-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-cas spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/console/console-deployment.yaml b/templates/console/console-deployment.yaml index 867e06c..7b37602 100644 --- a/templates/console/console-deployment.yaml +++ b/templates/console/console-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-console spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/datafeeder/datafeeder-deployment.yaml b/templates/datafeeder/datafeeder-deployment.yaml index 7571f4d..4a30abb 100644 --- a/templates/datafeeder/datafeeder-deployment.yaml +++ b/templates/datafeeder/datafeeder-deployment.yaml @@ -10,7 +10,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-datafeeder spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/datafeeder/import-deployment.yaml b/templates/datafeeder/import-deployment.yaml index dacbb47..1cbe499 100644 --- a/templates/datafeeder/import-deployment.yaml +++ b/templates/datafeeder/import-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-datafeeder-import spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/extractorapp/extractorapp-deployment.yaml b/templates/extractorapp/extractorapp-deployment.yaml index d2e0281..e9873b1 100644 --- a/templates/extractorapp/extractorapp-deployment.yaml +++ b/templates/extractorapp/extractorapp-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-extractorapp spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml index 31325b4..d89cbad 100644 --- a/templates/gateway/gateway-deployment.yaml +++ b/templates/gateway/gateway-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-gateway spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/geonetwork/elasticsearch/es-deployment.yaml b/templates/geonetwork/elasticsearch/es-deployment.yaml index 8869d1d..7ac43aa 100644 --- a/templates/geonetwork/elasticsearch/es-deployment.yaml +++ b/templates/geonetwork/elasticsearch/es-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-gn4-elasticsearch spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} strategy: type: Recreate selector: diff --git a/templates/geonetwork/geonetwork-deployment.yaml b/templates/geonetwork/geonetwork-deployment.yaml index 4d622e0..8c5437f 100644 --- a/templates/geonetwork/geonetwork-deployment.yaml +++ b/templates/geonetwork/geonetwork-deployment.yaml @@ -9,7 +9,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-geonetwork spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} strategy: type: Recreate selector: diff --git a/templates/geonetwork/kibana/kibana-deployment.yaml b/templates/geonetwork/kibana/kibana-deployment.yaml index 93c9eec..5c9cf3e 100644 --- a/templates/geonetwork/kibana/kibana-deployment.yaml +++ b/templates/geonetwork/kibana/kibana-deployment.yaml @@ -7,7 +7,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-gn4-kibana spec: - replicas: {{ .Values.georchestra.webapps.geonetwork.kibana.replicas | default 1 }} + replicas: {{ .Values.georchestra.webapps.geonetwork.kibana.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml b/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml index 13f89d6..a295b8a 100644 --- a/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml +++ b/templates/geonetwork/ogc-api-records/ogc-api-records-deployment.yaml @@ -9,7 +9,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-gn4-ogc-api-records spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/geoserver/geoserver-deployment.yaml b/templates/geoserver/geoserver-deployment.yaml index 1363f20..7f2267b 100644 --- a/templates/geoserver/geoserver-deployment.yaml +++ b/templates/geoserver/geoserver-deployment.yaml @@ -13,7 +13,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-geoserver spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} strategy: type: Recreate selector: diff --git a/templates/header/header-deployment.yaml b/templates/header/header-deployment.yaml index f1b9a3f..99a6145 100644 --- a/templates/header/header-deployment.yaml +++ b/templates/header/header-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-header spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/ldap/openldap-deployment.yaml b/templates/ldap/openldap-deployment.yaml index 424a78f..9e8d8da 100644 --- a/templates/ldap/openldap-deployment.yaml +++ b/templates/ldap/openldap-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-ldap spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} strategy: type: Recreate selector: diff --git a/templates/mapfishapp/mapfishapp-deployment.yaml b/templates/mapfishapp/mapfishapp-deployment.yaml index 4581b2e..441e3a5 100644 --- a/templates/mapfishapp/mapfishapp-deployment.yaml +++ b/templates/mapfishapp/mapfishapp-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-mapfishapp spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/mapstore/mapstore-deployment.yaml b/templates/mapstore/mapstore-deployment.yaml index 4758be1..69e7dde 100644 --- a/templates/mapstore/mapstore-deployment.yaml +++ b/templates/mapstore/mapstore-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-mapstore spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} strategy: type: Recreate selector: diff --git a/templates/security-proxy/security-proxy-deployment.yaml b/templates/security-proxy/security-proxy-deployment.yaml index ecbe600..afe27a8 100644 --- a/templates/security-proxy/security-proxy-deployment.yaml +++ b/templates/security-proxy/security-proxy-deployment.yaml @@ -8,7 +8,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-sp spec: - replicas: {{ $webapp.replicas | default 1 }} + replicas: {{ $webapp.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/templates/smtp-smarthost/smtp-deployment.yaml b/templates/smtp-smarthost/smtp-deployment.yaml index 33da10f..702f32b 100644 --- a/templates/smtp-smarthost/smtp-deployment.yaml +++ b/templates/smtp-smarthost/smtp-deployment.yaml @@ -7,7 +7,7 @@ metadata: {{- include "georchestra.labels" . | nindent 4 }} app.kubernetes.io/component: {{ include "georchestra.fullname" . }}-smtp spec: - replicas: {{ .Values.georchestra.smtp_smarthost.replicas | default 1 }} + replicas: {{ .Values.georchestra.smtp_smarthost.replicaCount }} selector: matchLabels: {{- include "georchestra.selectorLabels" . | nindent 6 }} diff --git a/values.yaml b/values.yaml index 22c9c31..6ec3b40 100644 --- a/values.yaml +++ b/values.yaml @@ -15,25 +15,25 @@ georchestra: # (cardinality 0..1) analytics: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/analytics:latest extra_environment: [] # registry_secret: default cas: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/cas:latest # registry_secret: default console: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/console:latest extra_environment: [] lifecycle: {} # registry_secret: default datafeeder: enabled: true # won't deploy if datafeeder_frontend is not enable - # replicas: "1" + replicaCount: "1" docker_image: georchestra/datafeeder:latest extra_environment: # - name: SMTPHOST @@ -46,19 +46,19 @@ georchestra: datafeeder_frontend: # Matches datafeeder/import-xxx.yaml templates in the helm chart enabled: true # won't deploy if datafeeder is not enable - # replicas: "1" + replicaCount: "1" docker_image: georchestra/datafeeder-frontend:latest lifecycle: {} # registry_secret: default extractorapp: enabled: false - # replicas: "1" + replicaCount: "1" docker_image: georchestra/extractorapp:latest extra_environment: [] # registry_secret: default geonetwork: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/geonetwork:latest # the registry secret is only used for the GeoNetwork image # registry_secret: default @@ -73,13 +73,13 @@ georchestra: extra_volumeMounts: [] ogc_api_records: enabled: true - # replicas: "1" + replicaCount: "1" image: georchestra/gn-cloud-ogc-api-records-service:2021-12-16 extra_environment: [] envsubst: enabled: true elasticsearch: - # replicas: "1" + replicaCount: "1" resources: limits: memory: 5120Mi @@ -87,7 +87,7 @@ georchestra: memory: 5120Mi image: docker.elastic.co/elasticsearch/elasticsearch:7.15.1 kibana: - # replicas: "1" + replicaCount: "1" image: docker.elastic.co/kibana/kibana:7.15.1 # automatically clean some logs of geonetwork housekeeping: @@ -96,26 +96,26 @@ georchestra: schedule: "0 1 * * *" geoserver: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/geoserver:latest jetty_monitoring: false extra_environment: [] # registry_secret: default header: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/header:latest extra_environment: [] # registry_secret: default mapfishapp: enabled: false - # replicas: "1" + replicaCount: "1" docker_image: georchestra/mapfishapp:latest extra_environment: [] # registry_secret: default mapstore: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/mapstore:latest # registry_secret: default # no need to put the original command already managed @@ -124,7 +124,7 @@ georchestra: lifecycle: {} openldap: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/ldap:latest extraVolumeMounts: [] # - name: copy-portal-skins @@ -138,7 +138,7 @@ georchestra: # registry_secret: default proxy: enabled: true - # replicas: "1" + replicaCount: "1" docker_image: georchestra/security-proxy:latest jetty_monitoring: false extra_environment: [] @@ -147,7 +147,7 @@ georchestra: enabled: true gateway: enabled: false - # replicas: "1" + replicaCount: "1" docker_image: georchestra/gateway:latest environment: JAVA_TOOL_OPTIONS: "-Dgeorchestra.datadir=/etc/georchestra"