diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /tooling/lib | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'tooling/lib')
| -rw-r--r-- | tooling/lib/tooling/kubernetes_client.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tooling/lib/tooling/kubernetes_client.rb b/tooling/lib/tooling/kubernetes_client.rb index 12c4ee0039f..1d7b924e2c3 100644 --- a/tooling/lib/tooling/kubernetes_client.rb +++ b/tooling/lib/tooling/kubernetes_client.rb @@ -142,10 +142,13 @@ module Tooling def resources_created_before_date(response, date) items = JSON.parse(response)['items'] # rubocop:disable Gitlab/Json - items.filter_map do |item| + items.each_with_object([]) do |item, result| item_created_at = Time.parse(item.dig('metadata', 'creationTimestamp')) - item.dig('metadata', 'name') if item_created_at < date + if item_created_at < date + resource_name = item.dig('metadata', 'name') + result << resource_name + end end rescue ::JSON::ParserError => ex puts "Ignoring this JSON parsing error: #{ex}\n\nResponse was:\n#{response}" # rubocop:disable Rails/Output |