Commit 02fad28a authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'remove-support-for-app-label-matching' into 'master'

Remove support for app label matching

See merge request gitlab-org/gitlab-ce!29460
parents bb34f09f 1a3d6ad6
...@@ -86,8 +86,7 @@ To display the Deploy Boards for a specific [environment] you should: ...@@ -86,8 +86,7 @@ To display the Deploy Boards for a specific [environment] you should:
Kubernetes. Kubernetes.
NOTE: **Note:** NOTE: **Note:**
The Kubernetes label of `app` is deprecated and may be removed in next major Matching based on the Kubernetes `app` label was removed in [GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14020)
release, GitLab 12.0.
![Deploy Boards Kubernetes Label](img/deploy_boards_kubernetes_label.png) ![Deploy Boards Kubernetes Label](img/deploy_boards_kubernetes_label.png)
......
...@@ -37,15 +37,10 @@ module Gitlab ...@@ -37,15 +37,10 @@ module Gitlab
# Filters an array of pods (as returned by the kubernetes API) by their project and environment # Filters an array of pods (as returned by the kubernetes API) by their project and environment
def filter_by_project_environment(items, app, env) def filter_by_project_environment(items, app, env)
pods = filter_by_annotation(items, { filter_by_annotation(items, {
'app.gitlab.com/app' => app, 'app.gitlab.com/app' => app,
'app.gitlab.com/env' => env 'app.gitlab.com/env' => env
}) })
return pods unless pods.empty?
filter_by_label(items, {
'app' => env, # deprecated: replaced by app.gitlab.com/env
})
end end
# Converts a pod (as returned by the kubernetes API) into a terminal # Converts a pod (as returned by the kubernetes API) into a terminal
......
...@@ -59,16 +59,6 @@ describe Gitlab::Kubernetes do ...@@ -59,16 +59,6 @@ describe Gitlab::Kubernetes do
describe '#filter_by_project_environment' do describe '#filter_by_project_environment' do
let(:matching_pod) { kube_pod(environment_slug: 'production', project_slug: 'my-cool-app') } let(:matching_pod) { kube_pod(environment_slug: 'production', project_slug: 'my-cool-app') }
it 'returns matching legacy env label' do
matching_pod['metadata']['annotations'].delete('app.gitlab.com/app')
matching_pod['metadata']['annotations'].delete('app.gitlab.com/env')
matching_pod['metadata']['labels']['app'] = 'production'
matching_items = [matching_pod]
items = matching_items + [kube_pod]
expect(filter_by_project_environment(items, 'my-cool-app', 'production')).to eq(matching_items)
end
it 'returns matching env label' do it 'returns matching env label' do
matching_items = [matching_pod] matching_items = [matching_pod]
items = matching_items + [kube_pod] items = matching_items + [kube_pod]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment