Remove datastore from setup/config templates for relDB (#258)

Author: Janmtbehrens

Makefile

@@ -22,6 +22,16 @@ lint:
 gofmt:
 	gofmt -l -s -w .
 
+openslides:
+	docker build . --target builder --tag openslides-manage-builder
+	docker run --interactive --tty --volume $(dir $(mkfile_path)):/build/ --rm openslides-manage-builder sh -c " \
+		if [ $(shell whoami) != root ]; then \
+			addgroup -g $(shell id -g) build ; \
+			adduser -u $(shell id -u) -G build -D build ; \
+			chown build: /app/openslides ; \
+		fi; \
+		cp -p /app/openslides /build/"
+
 ########################## Deprecation List ##########################
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
@@ -53,14 +63,4 @@ protoc: | deprecation-warning
 	--go-grpc_out=require_unimplemented_servers=false:. --go-grpc_opt=paths=source_relative \
 	proto/manage.proto
 
-openslides: | deprecation-warning
-	docker build . --target builder --tag openslides-manage-builder
-	docker run --interactive --tty --volume $(dir $(mkfile_path)):/build/ --rm openslides-manage-builder sh -c " \
-		if [ $(shell whoami) != root ]; then \
-			addgroup -g $(shell id -g) build ; \
-			adduser -u $(shell id -u) -G build -D build ; \
-			chown build: /app/openslides ; \
-		fi; \
-		cp -p /app/openslides /build/"
-
 .PHONY: openslides

pkg/config/config.go

@@ -233,8 +233,6 @@ func NewYmlConfig(configFiles [][]byte) (*YmlConfig, error) {
 		"backendAction",
 		"backendPresenter",
 		"backendManage",
-		"datastoreReader",
-		"datastoreWriter",
 		"postgres",
 		"autoupdate",
 		"auth",

pkg/config/default-config.yml

@@ -25,11 +25,6 @@ defaultEnvironment:
   PRESENTER_HOST: backendPresenter
   PRESENTER_PORT: 9003
 
-  DATASTORE_READER_HOST: datastoreReader
-  DATASTORE_READER_PORT: 9010
-  DATASTORE_WRITER_HOST: datastoreWriter
-  DATASTORE_WRITER_PORT: 9011
-
   AUTOUPDATE_HOST: autoupdate
   AUTOUPDATE_PORT: 9012
 

pkg/config/default-docker-compose.yml

@@ -78,7 +78,6 @@ services:
     image: {{ .ContainerRegistry }}/openslides-backend:{{ .Tag }}
     {{- if checkFlag $.DisableDependsOn }}{{ else }}
     depends_on:
-      - datastoreWriter
       - auth
       - media
       - vote
@@ -131,7 +130,6 @@ services:
     image: {{ .ContainerRegistry }}/openslides-backend:{{ .Tag }}
     {{- if checkFlag $.DisableDependsOn }}{{ else }}
     depends_on:
-      - datastoreWriter
       - postgres
     {{- end }}
     environment:
@@ -151,45 +149,6 @@ services:
   {{- end }}
 
 
-  {{- with .Services.datastoreReader }}
-
-  datastoreReader:
-    image: {{ .ContainerRegistry }}/openslides-datastore-reader:{{ .Tag }}
-    {{- if checkFlag $.DisableDependsOn }}{{ else }}
-    depends_on:
-      - postgres
-    {{- end }}
-    environment:
-      << : *default-environment
-      {{- with .Environment }}{{ marshalContent 6 . }}{{- end }}
-    networks:
-      - data
-    secrets:
-      - postgres_password
-    {{- with .AdditionalContent }}{{ marshalContent 4 . }}{{- end }}
-  {{- end }}
-
-
-  {{- with .Services.datastoreWriter }}
-
-  datastoreWriter:
-    image: {{ .ContainerRegistry }}/openslides-datastore-writer:{{ .Tag }}
-    {{- if checkFlag $.DisableDependsOn }}{{ else }}
-    depends_on:
-      - postgres
-      - redis
-    {{- end }}
-    environment:
-      << : *default-environment
-      {{- with .Environment }}{{ marshalContent 6 . }}{{- end }}
-    networks:
-      - data
-    secrets:
-      - postgres_password
-    {{- with .AdditionalContent }}{{ marshalContent 4 . }}{{- end }}
-  {{- end }}
-
-
   {{- if checkFlag .DisablePostgres }}{{ else }}{{- with .Services.postgres }}
 
   postgres:
@@ -216,7 +175,6 @@ services:
     image: {{ .ContainerRegistry }}/openslides-autoupdate:{{ .Tag }}
     {{- if checkFlag $.DisableDependsOn }}{{ else }}
     depends_on:
-      - datastoreReader
       - redis
     {{- end }}
     environment:
@@ -239,7 +197,6 @@ services:
     image: {{ .ContainerRegistry }}/openslides-search:{{ .Tag }}
     {{- if checkFlag $.DisableDependsOn }}{{ else }}
     depends_on:
-      - datastoreReader
       - postgres
       - autoupdate
     {{- end }}
@@ -285,7 +242,6 @@ services:
     image: {{ .ContainerRegistry }}/openslides-auth:{{ .Tag }}
     {{- if checkFlag $.DisableDependsOn }}{{ else }}
     depends_on:
-      - datastoreReader
       - redis
     {{- end }}
     environment:
@@ -298,6 +254,7 @@ services:
       - auth_token_key
       - auth_cookie_key
       - internal_auth_password
+      - postgres_password
     {{- with .AdditionalContent }}{{ marshalContent 4 . }}{{- end }}
   {{- end }}
 
@@ -307,7 +264,6 @@ services:
     image: {{ .ContainerRegistry }}/openslides-vote:{{ .Tag }}
     {{- if checkFlag $.DisableDependsOn }}{{ else }}
     depends_on:
-      - datastoreReader
       - auth
       - autoupdate
       - redis
@@ -367,7 +323,6 @@ services:
     image: {{ .ContainerRegistry }}/openslides-icc:{{ .Tag }}
     {{- if checkFlag $.DisableDependsOn }}{{ else }}
     depends_on:
-      - datastoreReader
       - postgres
       - redis
     {{- end }}
@@ -391,7 +346,6 @@ services:
     image: {{ .ContainerRegistry }}/openslides-manage:{{ .Tag }}
     {{- if checkFlag $.DisableDependsOn }}{{ else }}
     depends_on:
-      - datastoreReader
       - backendManage
     {{- end }}
     environment:

pkg/setup/setup_test.go

@@ -482,10 +482,6 @@ x-default-environment: &default-environment
   DATABASE_PASSWORD_FILE: /run/secrets/postgres_password
   DATABASE_PORT: "5432"
   DATABASE_USER: openslides
-  DATASTORE_READER_HOST: datastoreReader
-  DATASTORE_READER_PORT: "9010"
-  DATASTORE_WRITER_HOST: datastoreWriter
-  DATASTORE_WRITER_PORT: "9011"
   ICC_HOST: icc
   ICC_PORT: "9007"
   INTERNAL_AUTH_PASSWORD_FILE: /run/secrets/internal_auth_password
@@ -567,7 +563,6 @@ services:
   backendAction:
     image: ghcr.io/openslides/openslides/openslides-backend:latest
     depends_on:
-      - datastoreWriter
       - auth
       - media
       - vote
@@ -604,7 +599,6 @@ services:
   backendManage:
     image: ghcr.io/openslides/openslides/openslides-backend:latest
     depends_on:
-      - datastoreWriter
       - postgres
     environment:
       << : *default-environment
@@ -620,30 +614,6 @@ services:
       - postgres_password
       - superadmin
 
-  datastoreReader:
-    image: ghcr.io/openslides/openslides/openslides-datastore-reader:latest
-    depends_on:
-      - postgres
-    environment:
-      << : *default-environment
-      NUM_WORKERS: "8"
-    networks:
-      - data
-    secrets:
-      - postgres_password
-
-  datastoreWriter:
-    image: ghcr.io/openslides/openslides/openslides-datastore-writer:latest
-    depends_on:
-      - postgres
-      - redis
-    environment:
-      << : *default-environment
-    networks:
-      - data
-    secrets:
-      - postgres_password
-
   postgres:
     image: postgres:15
     environment:
@@ -661,7 +631,6 @@ services:
   autoupdate:
     image: ghcr.io/openslides/openslides/openslides-autoupdate:latest
     depends_on:
-      - datastoreReader
       - redis
     environment:
       << : *default-environment
@@ -676,7 +645,6 @@ services:
   search:
     image: ghcr.io/openslides/openslides/openslides-search:latest
     depends_on:
-      - datastoreReader
       - postgres
       - autoupdate
     environment:
@@ -708,7 +676,6 @@ services:
   auth:
     image: ghcr.io/openslides/openslides/openslides-auth:latest
     depends_on:
-      - datastoreReader
       - redis
     environment:
       << : *default-environment
@@ -719,11 +686,11 @@ services:
       - auth_token_key
       - auth_cookie_key
       - internal_auth_password
+      - postgres_password
 
   vote:
     image: ghcr.io/openslides/openslides/openslides-vote:latest
     depends_on:
-      - datastoreReader
       - auth
       - autoupdate
       - redis
@@ -762,7 +729,6 @@ services:
   icc:
     image: ghcr.io/openslides/openslides/openslides-icc:latest
     depends_on:
-      - datastoreReader
       - postgres
       - redis
     environment:
@@ -778,7 +744,6 @@ services:
   manage:
     image: ghcr.io/openslides/openslides/openslides-manage:latest
     depends_on:
-      - datastoreReader
       - backendManage
     environment:
       << : *default-environment