Add latest changes from gitlab-org/gitlab@master

lib/gitlab/kubernetes/kube_client.rb

@@ -16,6 +16,7 @@ module Gitlab
       SUPPORTED_API_GROUPS = {
         core: { group: 'api', version: 'v1' },
         rbac: { group: 'apis/rbac.authorization.k8s.io', version: 'v1' },
+        apps: { group: 'apis/apps', version: 'v1' },
         extensions: { group: 'apis/extensions', version: 'v1beta1' },
         istio: { group: 'apis/networking.istio.io', version: 'v1alpha3' },
         knative: { group: 'apis/serving.knative.dev', version: 'v1alpha1' }
@@ -74,10 +75,6 @@ module Gitlab
         :update_role_binding,
         to: :rbac_client
-      # Deployments resource is currently on the apis/extensions api group
-      delegate :get_deployments,
-        to: :extensions_client
-
       # non-entity methods that can only work with the core client
       # as it uses the pods/log resource
       delegate :get_pod_log,
@@ -103,6 +100,21 @@ module Gitlab
         validate_url!
       end
+      # Deployments resource is currently on the apis/extensions api group
+      # until Kubernetes 1.15. Kubernetest 1.16+ has deployments resources in
+      # the apis/apps api group.
+      #
+      # As we still support Kubernetes 1.12+, we will need to support both.
+      def get_deployments(**args)
+        extensions_client.discover unless extensions_client.discovered
+
+        if extensions_client.respond_to?(:get_deployments)
+          extensions_client.get_deployments(**args)
+        else
+          apps_client.get_deployments(**args)
+        end
+      end
+
       def create_or_update_cluster_role_binding(resource)
         if cluster_role_binding_exists?(resource)
           update_cluster_role_binding(resource)

locale/gitlab.pot

@@ -2528,6 +2528,9 @@ msgstr ""
 msgid "Average per day: %{average}"
 msgstr ""
+msgid "Back to page %{number}"
+msgstr ""
+
 msgid "Background Color"
 msgstr ""
@@ -8951,7 +8954,7 @@ msgstr ""
 msgid "GitLab project export"
 msgstr ""
-msgid "GitLab restart is required to apply changes"
+msgid "GitLab restart is required to apply changes."
 msgstr ""
 msgid "GitLab single sign on URL"
@@ -10922,7 +10925,7 @@ msgstr ""
 msgid "Leave Admin Mode"
 msgstr ""
-msgid "Leave blank for no limit. Once set, existing personal access tokens may be revoked"
+msgid "Leave blank for no limit. Once set, existing personal access tokens may be revoked."
 msgstr ""
 msgid "Leave edit mode? All unsaved changes will be lost."
@@ -11496,6 +11499,9 @@ msgstr ""
 msgid "Maximum number of mirrors that can be synchronizing at the same time."
 msgstr ""
+msgid "Maximum page reached"
+msgstr ""
+
 msgid "Maximum push size (MB)"
 msgstr ""
@@ -17410,6 +17416,9 @@ msgstr ""
 msgid "Sorry, no projects matched your search"
 msgstr ""
+msgid "Sorry, you have exceeded the maximum browsable page number. Please use the API to explore further."
+msgstr ""
+
 msgid "Sorry, your filter produced no results"
 msgstr ""