summaryrefslogtreecommitdiff
path: root/doc/development/kubernetes.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-11 06:06:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-11 06:06:27 +0000
commitb4e072cbaf808793bafff148b0ec9d47819f479e (patch)
treec690c706803cf43b3358785681e693ea0e1f9f94 /doc/development/kubernetes.md
parent8c0166b9816477521bf34feb15575bbeb1a3c644 (diff)
downloadgitlab-ce-b4e072cbaf808793bafff148b0ec9d47819f479e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/kubernetes.md')
-rw-r--r--doc/development/kubernetes.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/development/kubernetes.md b/doc/development/kubernetes.md
index 5443bdea043..82aa02ac75d 100644
--- a/doc/development/kubernetes.md
+++ b/doc/development/kubernetes.md
@@ -44,12 +44,11 @@ to the relevant internal client.
All calls to the Kubernetes API must be in a background process. Do not
perform Kubernetes API calls within a web request as this will block
-unicorn and can easily lead to a Denial Of Service (DoS) attack in GitLab as
+Unicorn and can easily lead to a Denial Of Service (DoS) attack in GitLab as
the Kubernetes cluster response times are outside of our control.
The easiest way to ensure your calls happen a background process is to
-delegate any such work to happen in a [sidekiq
-worker](sidekiq_style_guide.md).
+delegate any such work to happen in a [Sidekiq worker](sidekiq_style_guide.md).
There are instances where you would like to make calls to Kubernetes and
return the response and as such a background worker does not seem to be