diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-06-07 18:39:04 +1200 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-19 11:06:43 +1200 |
commit | 04608acf03d72ad096ac44e5fd4949205d30a347 (patch) | |
tree | b1e06954116ba3ac66f99358d5a9a7272cd50f09 /spec/lib/gitlab | |
parent | 6fa900547dbd30b0db0070f87dbeb4b05d485b9b (diff) | |
download | gitlab-ce-04608acf03d72ad096ac44e5fd4949205d30a347.tar.gz |
Stop matching on legacy app label
From now on, only match on the annotations, instead of falling back to
legacy app label. This enables users to use the app label for other
purposes such as helm charts.
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/kubernetes_spec.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/spec/lib/gitlab/kubernetes_spec.rb b/spec/lib/gitlab/kubernetes_spec.rb index 57b570a9166..45369b91ed6 100644 --- a/spec/lib/gitlab/kubernetes_spec.rb +++ b/spec/lib/gitlab/kubernetes_spec.rb @@ -59,16 +59,6 @@ describe Gitlab::Kubernetes do describe '#filter_by_project_environment' do 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 matching_items = [matching_pod] items = matching_items + [kube_pod] |