Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

2 files changed, 50 insertions, 1 deletions

diff --git a/lib/gitlab/kubernetes/kube_client.rb b/lib/gitlab/kubernetes/kube_client.rb
index fa68afd39f5..13cd6dcad3f 100644
--- a/lib/gitlab/kubernetes/kube_client.rb
+++ b/lib/gitlab/kubernetes/kube_client.rb
@@ -167,6 +167,21 @@ module Gitlab
         end
       end
 
+      # Ingresses resource is currently on the apis/extensions api group
+      # until Kubernetes 1.21. Kubernetest 1.22+ has ingresses resources in
+      # the networking.k8s.io/v1 api group.
+      #
+      # As we still support Kubernetes 1.12+, we will need to support both.
+      def get_ingresses(**args)
+        extensions_client.discover unless extensions_client.discovered
+
+        if extensions_client.respond_to?(:get_ingresses)
+          extensions_client.get_ingresses(**args)
+        else
+          networking_client.get_ingresses(**args)
+        end
+      end
+
       def create_or_update_cluster_role_binding(resource)
         update_cluster_role_binding(resource)
       end
diff --git a/lib/gitlab/kubernetes/pod.rb b/lib/gitlab/kubernetes/pod.rb
index d247662dc3b..a5651f2f184 100644
--- a/lib/gitlab/kubernetes/pod.rb
+++ b/lib/gitlab/kubernetes/pod.rb
@@ -2,13 +2,47 @@
 
 module Gitlab
   module Kubernetes
-    module Pod
+    class Pod
       PENDING   = 'Pending'
       RUNNING   = 'Running'
       SUCCEEDED = 'Succeeded'
       FAILED    = 'Failed'
       UNKNOWN   = 'Unknown'
       PHASES    = [PENDING, RUNNING, SUCCEEDED, FAILED, UNKNOWN].freeze
+
+      STABLE_TRACK_VALUE = 'stable'
+
+      def initialize(attributes = {})
+        @attributes = attributes
+      end
+
+      def track
+        attributes.dig('metadata', 'labels', 'track') || STABLE_TRACK_VALUE
+      end
+
+      def name
+        metadata['name'] || metadata['generateName']
+      end
+
+      def stable?
+        track == STABLE_TRACK_VALUE
+      end
+
+      def status
+        attributes.dig('status', 'phase')
+      end
+
+      def order
+        stable? ? 1 : 0
+      end
+
+      private
+
+      attr_reader :attributes
+
+      def metadata
+        attributes.fetch('metadata', {})
+      end
     end
   end
 end