From a7daf6d6a0cb44317a822c77f1949906345a47e5 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 25 Nov 2024 15:04:36 +0100 Subject: [PATCH] remove per service store settings --- charts/ocis/docs/values-desc-table.adoc | 30 ------------------ charts/ocis/docs/values.adoc.yaml | 31 ------------------- charts/ocis/templates/_common/store.tpl | 6 ++-- .../templates/eventhistory/deployment.yaml | 1 - .../templates/postprocessing/deployment.yaml | 1 - charts/ocis/templates/userlog/deployment.yaml | 1 - charts/ocis/values.yaml | 31 ------------------- 7 files changed, 3 insertions(+), 98 deletions(-) diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc index 97b3e4387..99677d266 100644 --- a/charts/ocis/docs/values-desc-table.adoc +++ b/charts/ocis/docs/values-desc-table.adoc @@ -1512,12 +1512,6 @@ a| [subs=-attributes] a| [subs=-attributes] `{}` | Per-service resources configuration. Overrides the default setting from `resources` if set. -| services.activitylog.store -a| [subs=-attributes] -+object+ -a| [subs=-attributes] -`{}` -| Per-service store configuration for the activitylog service. Overrides the default setting from `store` if set. | services.antivirus a| [subs=-attributes] +object+ @@ -2088,12 +2082,6 @@ a| [subs=-attributes] a| [subs=-attributes] `{}` | Per-service resources configuration. Overrides the default setting from `resources` if set. -| services.eventhistory.store -a| [subs=-attributes] -+object+ -a| [subs=-attributes] -`{}` -| Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. | services.frontend a| [subs=-attributes] +object+ @@ -3192,12 +3180,6 @@ a| [subs=-attributes] a| [subs=-attributes] `{}` | Per-service resources configuration. Overrides the default setting from `resources` if set. -| services.postprocessing.store -a| [subs=-attributes] -+object+ -a| [subs=-attributes] -`{}` -| Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. | services.proxy a| [subs=-attributes] +object+ @@ -3660,12 +3642,6 @@ a| [subs=-attributes] a| [subs=-attributes] `{}` | Per-service resources configuration. Overrides the default setting from `resources` if set. -| services.sse.store -a| [subs=-attributes] -+object+ -a| [subs=-attributes] -`{}` -| Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. | services.storagepubliclink a| [subs=-attributes] +object+ @@ -4584,12 +4560,6 @@ a| [subs=-attributes] a| [subs=-attributes] `{}` | Per-service resources configuration. Overrides the default setting from `resources` if set. -| services.userlog.store -a| [subs=-attributes] -+object+ -a| [subs=-attributes] -`{}` -| Per-service store configuration for the userlog service. Overrides the default setting from `store` if set. | services.users a| [subs=-attributes] +object+ diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml index 740f252aa..2b0103632 100644 --- a/charts/ocis/docs/values.adoc.yaml +++ b/charts/ocis/docs/values.adoc.yaml @@ -910,15 +910,6 @@ services: nodeSelector: {} # -- Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set. priorityClassName: "" - # -- Per-service store configuration for the activitylog service. Overrides the default setting from `store` if set. - store: - {} - # -- Configure the store type for the activitylog service. Might be `memory` (only for testing), `redis-sentinel`, `nats-js-kv` - # type: - # -- Provide a list of comma-separated addresses of `redis-sentinel` or `nats-js` servers here - # if the proper store is selected - # addresses: - # - "{{ .appNameNats }}:9233" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. @@ -1170,15 +1161,6 @@ services: nodeSelector: {} # -- Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set. priorityClassName: "" - # -- Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. - store: - {} - # -- Configure the store type for the eventhistory service. Might be `memory` (only for testing), `redis-sentinel`, `nats-js-kv` - #type: - # -- Provide a list of comma-separated addresses of `redis-sentinel` or `nats-js` servers here - # if the proper store is selected - # addresses: [] - # - "{{ .appNameNats }}:9233" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. @@ -1631,8 +1613,6 @@ services: priorityClassName: "" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} - # -- Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. - store: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. autoscaling: {} # -- Affinity settings for the postprocessing service. See the documentation of this setting in approvider for examples. @@ -1831,8 +1811,6 @@ services: priorityClassName: "" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} - # -- Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. - store: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. autoscaling: {} # -- Affinity settings for the postprocessing service. See the documentation of this setting in approvider for examples. @@ -2247,15 +2225,6 @@ services: nodeSelector: {} # -- Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set. priorityClassName: "" - # -- Per-service store configuration for the userlog service. Overrides the default setting from `store` if set. - store: - {} - # -- Configure the store type for the userlog service. Might be `memory` (only for testing), `redis-sentinel`, `nats-js-kv` - # type: - # -- Provide a list of comma-separated addresses of `redis-sentinel` or `nats-js` servers here - # if the proper store is selected - # addresses: - # - "{{ .appNameNats }}:9233" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. diff --git a/charts/ocis/templates/_common/store.tpl b/charts/ocis/templates/_common/store.tpl index 72db85200..46f23ad43 100644 --- a/charts/ocis/templates/_common/store.tpl +++ b/charts/ocis/templates/_common/store.tpl @@ -4,13 +4,13 @@ oCIS store configuration {{- define "ocis.persistentStore" -}} {{- $valid := list "memory" "redis-sentinel" "nats-js-kv" -}} -{{- if not (has .store.type $valid) -}} +{{- if not (has .Values.store.type $valid) -}} {{- fail "invalid store.type set" -}} {{- end -}} - name: OCIS_PERSISTENT_STORE - value: {{ .store.type | quote }} + value: {{ .Values.store.type | quote }} - name: OCIS_PERSISTENT_STORE_NODES - value: {{ tpl (join "," .store.nodes) . | quote }} + value: {{ tpl (join "," .Values.store.nodes) . | quote }} {{- end -}} {{- define "ocis.cacheStore" -}} diff --git a/charts/ocis/templates/eventhistory/deployment.yaml b/charts/ocis/templates/eventhistory/deployment.yaml index 97718ccd7..982aacad3 100644 --- a/charts/ocis/templates/eventhistory/deployment.yaml +++ b/charts/ocis/templates/eventhistory/deployment.yaml @@ -1,5 +1,4 @@ {{- include "ocis.basicServiceTemplates" (dict "scope" . "appName" "appNameEventhistory" "appNameSuffix" "") -}} -{{- $_ := set . "store" (default (default (dict) .Values.store) .Values.services.eventhistory.store) -}} apiVersion: apps/v1 kind: Deployment {{ include "ocis.metadata" . }} diff --git a/charts/ocis/templates/postprocessing/deployment.yaml b/charts/ocis/templates/postprocessing/deployment.yaml index 42631836d..7f990ae17 100644 --- a/charts/ocis/templates/postprocessing/deployment.yaml +++ b/charts/ocis/templates/postprocessing/deployment.yaml @@ -1,5 +1,4 @@ {{- include "ocis.basicServiceTemplates" (dict "scope" . "appName" "appNamePostprocessing" "appNameSuffix" "") -}} -{{- $_ := set . "store" (default (default (dict) .Values.store) .Values.services.postprocessing.store) -}} apiVersion: apps/v1 kind: Deployment {{ include "ocis.metadata" . }} diff --git a/charts/ocis/templates/userlog/deployment.yaml b/charts/ocis/templates/userlog/deployment.yaml index 58363a9e9..235ac82cc 100644 --- a/charts/ocis/templates/userlog/deployment.yaml +++ b/charts/ocis/templates/userlog/deployment.yaml @@ -1,5 +1,4 @@ {{- include "ocis.basicServiceTemplates" (dict "scope" . "appName" "appNameUserlog" "appNameSuffix" "") -}} -{{- $_ := set . "store" (default (default (dict) .Values.store) .Values.services.userlog.store) -}} apiVersion: apps/v1 kind: Deployment {{ include "ocis.metadata" . }} diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index 5f3e73ba3..0ed9af9b0 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -909,15 +909,6 @@ services: nodeSelector: {} # -- Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set. priorityClassName: "" - # -- Per-service store configuration for the activitylog service. Overrides the default setting from `store` if set. - store: - {} - # -- Configure the store type for the activitylog service. Might be `memory` (only for testing), `redis-sentinel`, `nats-js-kv` - # type: - # -- Provide a list of comma-separated addresses of `redis-sentinel` or `nats-js` servers here - # if the proper store is selected - # addresses: - # - "{{ .appNameNats }}:9233" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. @@ -1169,15 +1160,6 @@ services: nodeSelector: {} # -- Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set. priorityClassName: "" - # -- Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. - store: - {} - # -- Configure the store type for the eventhistory service. Might be `memory` (only for testing), `redis-sentinel`, `nats-js-kv` - #type: - # -- Provide a list of comma-separated addresses of `redis-sentinel` or `nats-js` servers here - # if the proper store is selected - # addresses: [] - # - "{{ .appNameNats }}:9233" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. @@ -1630,8 +1612,6 @@ services: priorityClassName: "" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} - # -- Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. - store: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. autoscaling: {} # -- Affinity settings for the postprocessing service. See the documentation of this setting in approvider for examples. @@ -1830,8 +1810,6 @@ services: priorityClassName: "" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} - # -- Per-service store configuration for the eventhistory service. Overrides the default setting from `store` if set. - store: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set. autoscaling: {} # -- Affinity settings for the postprocessing service. See the documentation of this setting in approvider for examples. @@ -2246,15 +2224,6 @@ services: nodeSelector: {} # -- Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set. priorityClassName: "" - # -- Per-service store configuration for the userlog service. Overrides the default setting from `store` if set. - store: - {} - # -- Configure the store type for the userlog service. Might be `memory` (only for testing), `redis-sentinel`, `nats-js-kv` - # type: - # -- Provide a list of comma-separated addresses of `redis-sentinel` or `nats-js` servers here - # if the proper store is selected - # addresses: - # - "{{ .appNameNats }}:9233" # -- Per-service PodDisruptionBudget. Overrides the default setting from `podDisruptionBudget` if set. podDisruptionBudget: {} # -- Per-service autoscaling. Overrides the default setting from `autoscaling` if set.