summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-12-25 06:58:59 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-12-25 06:58:59 +0000
commitd6e16693dcfe24df35508fad6d2f03f3d26c0765 (patch)
treebbbf8e4d35f621d2c96681c1db9bdef730211234
parent0c8d7e8460f74ba3a2345e42884ed96321fbb897 (diff)
parentb762430795230aca5e949c24f7c06b172750ebb6 (diff)
downloadgitlab-ce-d6e16693dcfe24df35508fad6d2f03f3d26c0765.tar.gz
Merge branch 'sh-fix-helm-api-spec' into 'master'
Fix namespace ambiguity with Kubernetes Pod definitions Closes #41458 See merge request gitlab-org/gitlab-ce!16130
-rw-r--r--lib/gitlab/kubernetes/helm/api.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/kubernetes/helm/api.rb b/lib/gitlab/kubernetes/helm/api.rb
index ebd7dc1b100..737081ddc5b 100644
--- a/lib/gitlab/kubernetes/helm/api.rb
+++ b/lib/gitlab/kubernetes/helm/api.rb
@@ -34,7 +34,7 @@ module Gitlab
private
def pod_resource(command)
- Pod.new(command, @namespace.name, @kubeclient).generate
+ Gitlab::Kubernetes::Helm::Pod.new(command, @namespace.name, @kubeclient).generate
end
end
end