diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2019-08-07 14:00:16 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-08-07 14:00:16 +0300 |
commit | eff24958e00268d2da1012a02c69fc9450d17cf1 (patch) | |
tree | e92834c1ed189d99d9923ca8b36a17f5aa6d5af5 | |
parent | a8e2980b1ffe1a728ab13032dc81f90f4b990a03 (diff) | |
parent | 5b35d7d177d06dc6b17f9b80340e1b407225059c (diff) |
Merge branch 'jc-remove-docker-for-praefect' into 'master'
Remove docker for praefect
See merge request gitlab-org/gitaly!1402
-rw-r--r-- | Dockerfile.praefect | 24 | ||||
-rw-r--r-- | _support/praefect-cluster/.gitignore | 3 | ||||
-rw-r--r-- | _support/praefect-cluster/README.md | 8 | ||||
-rw-r--r-- | _support/praefect-cluster/config.praefect.toml | 40 | ||||
-rw-r--r-- | _support/praefect-cluster/docker-compose.yml | 52 | ||||
-rw-r--r-- | _support/praefect-cluster/gitaly-backup-1.toml | 49 | ||||
-rw-r--r-- | _support/praefect-cluster/gitaly-backup-2.toml | 49 | ||||
-rw-r--r-- | _support/praefect-cluster/gitaly-primary.toml | 49 |
8 files changed, 0 insertions, 274 deletions
diff --git a/Dockerfile.praefect b/Dockerfile.praefect deleted file mode 100644 index e3bb71779..000000000 --- a/Dockerfile.praefect +++ /dev/null @@ -1,24 +0,0 @@ -# This will create a docker image for Prafect that is suitable for testing, but -# is not expected to be used in a production environment, yet. -# -# See the _support/load-cluster/docker-compose.yml for an example of how to use -# this image -# -FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.18 - -WORKDIR /tmp/build - -COPY internal internal -COPY auth auth -COPY cmd cmd -COPY client client -COPY streamio streamio -COPY go.mod go.sum ./ - -WORKDIR /tmp/build/cmd/praefect - -RUN ["go", "build"] -RUN ["mkdir", "-p", "/etc/gitaly"] -RUN ["cp", "praefect", "/etc/gitaly/praefect"] -CMD ["/etc/gitaly/praefect", "/etc/gitaly/config.praefect.toml"] - diff --git a/_support/praefect-cluster/.gitignore b/_support/praefect-cluster/.gitignore deleted file mode 100644 index 06b873206..000000000 --- a/_support/praefect-cluster/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/gitaly-backup-1 -/gitaly-backup-2 -/gitaly-primary diff --git a/_support/praefect-cluster/README.md b/_support/praefect-cluster/README.md deleted file mode 100644 index cab4614b6..000000000 --- a/_support/praefect-cluster/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Test cluster with Praefect and multiple Gitaly servers - -This directory contains a -[docker-compose.yml](https://docs.docker.com/compose/) that has Praefect and 3 Gitaly servers -behind it. This setup is meant for testing purposes only and SHOULD NOT be used -in production environments. - -Boot the cluster with `docker-compose up`. After some time you can connect to praefect on port 2305 diff --git a/_support/praefect-cluster/config.praefect.toml b/_support/praefect-cluster/config.praefect.toml deleted file mode 100644 index e0f163178..000000000 --- a/_support/praefect-cluster/config.praefect.toml +++ /dev/null @@ -1,40 +0,0 @@ -# Example Praefect configuration file - -# # TCP address to listen on -listen_addr = ":2305" - -# # Praefect can listen on a socket when placed on the same machine as all clients - #socket_path = "/etc/gitaly/praefect/socket" -# # Praefect will only replicate whitelisted repositories -whitelist = ["@hashed/2c/62/2c624232cdd221771294dfbb310aca000a0df6ac8b66b696d90ef06fdefb64a3.git"] -# # Optional: export metrics via Prometheus -# prometheus_listen_addr = "127.0.01:10101" - -# # You can optionally configure Praefect to output JSON-formatted log messages to stdout -[logging] -# format = "json" - level = "info" -# # Optional: Set log level to only log entries with that severity or above -# # One of, in order: debug, info, warn, errror, fatal, panic -# # Defaults to "info" -# level = "warn" - -# # One or more Gitaly servers need to be configured to be managed. The names -# of each server are used to link multiple nodes, or `gitaly_server`s together -# as shard. listen_addr should be unique for all nodes. -# Requires the protocol to be defined, e.g. tcp://host.tld:1234 - -[primary_server] - name = "default" -# listen_addr = "tcp://gitaly-primary:9999" - listen_addr = "tcp://127.0.0.1:9999" - -[[secondary_server]] - name = "backup1" -# listen_addr = "tcp://gitaly-backup-1:9999" - listen_addr = "tcp://127.0.0.1:9998" - -[[secondary_server]] - name = "backup2" -# listen_addr = "tcp://gitaly-backup-2:9999" - listen_addr = "tcp://127.0.0.1:9997"
\ No newline at end of file diff --git a/_support/praefect-cluster/docker-compose.yml b/_support/praefect-cluster/docker-compose.yml deleted file mode 100644 index 6eb81be47..000000000 --- a/_support/praefect-cluster/docker-compose.yml +++ /dev/null @@ -1,52 +0,0 @@ -version: "3.5" -services: -# praefect: -# build: -# context: ../../ -# dockerfile: Dockerfile.praefect -# image: praefect:latest -# depends_on: -# - gitaly-primary -# - gitaly-backup-1 -# - gitaly-backup-2 -# command: ["/etc/gitaly/praefect", "-config", "/etc/gitaly/config.praefect.toml"] -# ports: -# - "2305:2305" -# volumes: -# - ./config.praefect.toml:/etc/gitaly/config.praefect.toml - gitaly-primary: - image: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest - environment: - - GITALY_TESTING_NO_GIT_HOOKS=1 - expose: - - "9999" - ports: - - "9999:9999" - command: ["/usr/local/bin/gitaly", "/etc/config/config.toml"] - volumes: - - ./gitaly-primary/data:/home/git/repositories - - ./gitaly-primary.toml:/etc/config/config.toml - gitaly-backup-1: - image: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest - environment: - - GITALY_TESTING_NO_GIT_HOOKS=1 - expose: - - "9999" - ports: - - "9998:9999" - command: ["/usr/local/bin/gitaly", "/etc/config/config.toml"] - volumes: - - ./gitaly-backup-1/data:/home/git/repositories - - ./gitaly-backup-1.toml:/etc/config/config.toml - gitaly-backup-2: - image: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest - environment: - - GITALY_TESTING_NO_GIT_HOOKS=1 - expose: - - "9999" - ports: - - "9997:9999" - command: ["/usr/local/bin/gitaly", "/etc/config/config.toml"] - volumes: - - ./gitaly-backup-2/data:/home/git/repositories - - ./gitaly-backup-2.toml:/etc/config/config.toml
\ No newline at end of file diff --git a/_support/praefect-cluster/gitaly-backup-1.toml b/_support/praefect-cluster/gitaly-backup-1.toml deleted file mode 100644 index 89d1884e3..000000000 --- a/_support/praefect-cluster/gitaly-backup-1.toml +++ /dev/null @@ -1,49 +0,0 @@ -# Example Gitaly configuration file - -# The directory where Gitaly's executables are stored -bin_dir = "/usr/local/bin" - -# listen on a TCP socket. This is insecure (no authentication) -listen_addr = "0.0.0.0:9999" - -# # Optional: export metrics via Prometheus -# prometheus_listen_addr = "localhost:9236" -# - -# # Git executable settings -# [git] -# bin_path = "/usr/bin/git" - -[[storage]] -name = "backup1" -path = "/home/git/repositories" - -# # You can optionally configure more storages for this Gitaly instance to serve up -# -# [[storage]] -# name = "other_storage" -# path = "/mnt/other_storage/repositories" -# - -# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout -# [logging] -# format = "json" -# # Additionally exceptions can be reported to Sentry -# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>" - -# # You can optionally configure Gitaly to record histogram latencies on GRPC method calls -# [prometheus] -# grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0] - -[gitaly-ruby] -# The directory where gitaly-ruby is installed -dir = "/srv/gitaly-ruby" - -[gitlab-shell] -# The directory where gitlab-shell is installed -dir = "/srv/gitlab-shell" - -# # You can adjust the concurrency of each RPC endpoint -# [[concurrency]] -# rpc = "/gitaly.RepositoryService/GarbageCollect" -# max_per_repo = 1 diff --git a/_support/praefect-cluster/gitaly-backup-2.toml b/_support/praefect-cluster/gitaly-backup-2.toml deleted file mode 100644 index 1b5ce8d20..000000000 --- a/_support/praefect-cluster/gitaly-backup-2.toml +++ /dev/null @@ -1,49 +0,0 @@ -# Example Gitaly configuration file - -# The directory where Gitaly's executables are stored -bin_dir = "/usr/local/bin" - -# listen on a TCP socket. This is insecure (no authentication) -listen_addr = "0.0.0.0:9999" - -# # Optional: export metrics via Prometheus -# prometheus_listen_addr = "localhost:9236" -# - -# # Git executable settings -# [git] -# bin_path = "/usr/bin/git" - -[[storage]] -name = "backup2" -path = "/home/git/repositories" - -# # You can optionally configure more storages for this Gitaly instance to serve up -# -# [[storage]] -# name = "other_storage" -# path = "/mnt/other_storage/repositories" -# - -# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout -# [logging] -# format = "json" -# # Additionally exceptions can be reported to Sentry -# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>" - -# # You can optionally configure Gitaly to record histogram latencies on GRPC method calls -# [prometheus] -# grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0] - -[gitaly-ruby] -# The directory where gitaly-ruby is installed -dir = "/srv/gitaly-ruby" - -[gitlab-shell] -# The directory where gitlab-shell is installed -dir = "/srv/gitlab-shell" - -# # You can adjust the concurrency of each RPC endpoint -# [[concurrency]] -# rpc = "/gitaly.RepositoryService/GarbageCollect" -# max_per_repo = 1 diff --git a/_support/praefect-cluster/gitaly-primary.toml b/_support/praefect-cluster/gitaly-primary.toml deleted file mode 100644 index 2379b6951..000000000 --- a/_support/praefect-cluster/gitaly-primary.toml +++ /dev/null @@ -1,49 +0,0 @@ -# Example Gitaly configuration file - -# The directory where Gitaly's executables are stored -bin_dir = "/usr/local/bin" - -# listen on a TCP socket. This is insecure (no authentication) -listen_addr = "0.0.0.0:9999" - -# # Optional: export metrics via Prometheus -# prometheus_listen_addr = "localhost:9236" -# - -# # Git executable settings -# [git] -# bin_path = "/usr/bin/git" - -[[storage]] -name = "default" -path = "/home/git/repositories" - -# # You can optionally configure more storages for this Gitaly instance to serve up -# -# [[storage]] -# name = "other_storage" -# path = "/mnt/other_storage/repositories" -# - -# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout -# [logging] -# format = "json" -# # Additionally exceptions can be reported to Sentry -# sentry_dsn = "https://<key>:<secret>@sentry.io/<project>" - -# # You can optionally configure Gitaly to record histogram latencies on GRPC method calls -# [prometheus] -# grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0] - -[gitaly-ruby] -# The directory where gitaly-ruby is installed -dir = "/srv/gitaly-ruby" - -[gitlab-shell] -# The directory where gitlab-shell is installed -dir = "/srv/gitlab-shell" - -# # You can adjust the concurrency of each RPC endpoint -# [[concurrency]] -# rpc = "/gitaly.RepositoryService/GarbageCollect" -# max_per_repo = 1 |