summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-05-17 17:18:32 +0900
committerShinya Maeda <shinya@gitlab.com>2018-05-24 17:00:56 +0900
commite8dd1a25a5a0a9564e03c86eab5cbd06162e3feb (patch)
treed0dfe839da03a9e2dfab87b0103f9bbf3d98d68d
parentbc5e7da3b1fe2290606ef42bba4cad13f148c284 (diff)
downloadgitlab-ce-e8dd1a25a5a0a9564e03c86eab5cbd06162e3feb.tar.gz
Remove deprecated kubernetes service API
-rw-r--r--doc/api/services.md38
-rw-r--r--lib/api/services.rb28
2 files changed, 0 insertions, 66 deletions
diff --git a/doc/api/services.md b/doc/api/services.md
index f23303ef836..e99d9063770 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -565,44 +565,6 @@ Remove all previously JIRA settings from a project.
DELETE /projects/:id/services/jira
```
-## Kubernetes
-
-Kubernetes / Openshift integration
-
-CAUTION: **Warning:**
-Kubernetes service integration has been deprecated in GitLab 10.3. API service endpoints will continue to work as long as the Kubernetes service is active, however if the service is inactive API endpoints will automatically return a `400 Bad Request`. Read [GitLab 10.3 release post](https://about.gitlab.com/2017/12/22/gitlab-10-3-released/#kubernetes-integration-service) for more information.
-
-### Create/Edit Kubernetes service
-
-Set Kubernetes service for a project.
-
-```
-PUT /projects/:id/services/kubernetes
-```
-
-Parameters:
-
-- `namespace` (**required**) - The Kubernetes namespace to use
-- `api_url` (**required**) - The URL to the Kubernetes cluster API, e.g., https://kubernetes.example.com
-- `token` (**required**) - The service token to authenticate against the Kubernetes cluster with
-- `ca_pem` (optional) - A custom certificate authority bundle to verify the Kubernetes cluster with (PEM format)
-
-### Delete Kubernetes service
-
-Delete Kubernetes service for a project.
-
-```
-DELETE /projects/:id/services/kubernetes
-```
-
-### Get Kubernetes service settings
-
-Get Kubernetes service settings for a project.
-
-```
-GET /projects/:id/services/kubernetes
-```
-
## Slack slash commands
Ability to receive slash commands from a Slack chat instance.
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 794fdab8f2b..8f397cee426 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -470,33 +470,6 @@ module API
desc: 'The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the **Transitions (id)** column ([see screenshot][trans]). By default, this ID is set to `2`'
}
],
-
- 'kubernetes' => [
- {
- required: true,
- name: :namespace,
- type: String,
- desc: 'The Kubernetes namespace to use'
- },
- {
- required: true,
- name: :api_url,
- type: String,
- desc: 'The URL to the Kubernetes cluster API, e.g., https://kubernetes.example.com'
- },
- {
- required: true,
- name: :token,
- type: String,
- desc: 'The service token to authenticate against the Kubernetes cluster with'
- },
- {
- required: false,
- name: :ca_pem,
- type: String,
- desc: 'A custom certificate authority bundle to verify the Kubernetes cluster with (PEM format)'
- }
- ],
'mattermost-slash-commands' => [
{
required: true,
@@ -691,7 +664,6 @@ module API
HipchatService,
IrkerService,
JiraService,
- KubernetesService,
MattermostSlashCommandsService,
SlackSlashCommandsService,
PackagistService,