Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/gitlab/kubernetes/kube_client.rb b/lib/gitlab/kubernetes/kube_client.rb
index b23ca095414..21d5c9b0eee 100644
--- a/lib/gitlab/kubernetes/kube_client.rb
+++ b/lib/gitlab/kubernetes/kube_client.rb
@@ -17,6 +17,7 @@ module Gitlab
         core: { group: 'api', version: 'v1' },
         rbac: { group: 'apis/rbac.authorization.k8s.io', version: 'v1' },
         extensions: { group: 'apis/extensions', version: 'v1beta1' },
+        istio: { group: 'apis/networking.istio.io', version: 'v1alpha3' },
         knative: { group: 'apis/serving.knative.dev', version: 'v1alpha1' }
       }.freeze
 
@@ -91,6 +92,13 @@ module Gitlab
         :watch_pod_log,
         to: :core_client
 
+      # Gateway methods delegate to the apis/networking.istio.io api
+      # group client
+      delegate :create_gateway,
+        :get_gateway,
+        :update_gateway,
+        to: :istio_client
+
       attr_reader :api_prefix, :kubeclient_options
 
       # We disable redirects through 'http_max_redirects: 0',