Merge remote-tracking branch master into petrosian

app/models/manageiq/providers/openshift/container_manager.rb

@@ -50,7 +50,7 @@ def self.raw_connect(hostname, port, options)
   end
 
   def self.openshift_connect(hostname, port, options)
-    api_group = options[:api_group] || "apps.openshift.io/v1"
+    api_group = options[:api_group] || "config.openshift.io/v1"
     api_path, api_version = api_group.split("/")
 
     options = {:path => "/apis/#{api_path}", :version => api_version}.merge(options)
@@ -62,6 +62,10 @@ def self.verify_default_credentials(hostname, port, options)
 
     ocp = openshift_connect(hostname, port, options)
     !!ocp&.api_valid?
+  rescue Kubeclient::ResourceNotFoundError
+    # If the /apis/config.openshift.io/v1 endpoint isn't available then we have
+    # connected to an unsupported version of openshift
+    raise MiqException::Error, _("Unsupported OpenShift version")
   end
 
   def self.api_group_for_kind(kind)
@@ -96,15 +100,16 @@ def connect_client(kind, api_version, method_name)
     if version
       @clients[api_version] ||= connect(:service => 'kubernetes', :version => version, :path => '/apis/' + api)
     else
+      kubernetes_client_key = File.join("/api", api_version)
+      @clients[kubernetes_client_key] ||= connect(:service => 'kubernetes', :version => api_version)
+
       # If we're given an OpenShift object lookup its v4 API Group
       api_group = self.class.api_group_for_kind(kind)
-      path      = api_group ? "/apps/#{api_group}" : "/oapi"
+      if api_group
+        openshift_client_key = File.join(path, "/apps/#{api_group}")
+        @clients[openshift_client_key] ||= connect(:api_group => api_group, :version => api_version)
+      end
 
-      openshift_client_key  = File.join(path, api_version)
-      kubernetes_client_key = File.join("/api", api_version)
-
-      @clients[openshift_client_key] ||= connect(:api_group => api_group, :version => api_version)
-      @clients[kubernetes_client_key] ||= connect(:service => 'kubernetes', :version => api_version)
       @clients[openshift_client_key].respond_to?(method_name) ? @clients[openshift_client_key] : @clients[kubernetes_client_key]
     end
   end

lib/manageiq/providers/openshift.rb

@@ -1 +1,3 @@
 require "manageiq/providers/openshift/engine"
+require "manageiq/providers/openshift/version"
+

spec/models/manageiq/providers/openshift/container_manager_spec.rb

@@ -1,4 +1,19 @@
 describe ManageIQ::Providers::Openshift::ContainerManager do
+  describe ".verify_default_credentials" do
+    context "with a v3 cluster" do
+      it "raises an unsupported exception" do
+        require "kubeclient"
+
+        allow(Kubeclient::Client)
+          .to receive(:new)
+          .with(URI.parse("https://openshiftv3:8443/oapi"), "v1", anything)
+          .and_raise(Kubeclient::ResourceNotFoundError.new(404, "404 Not Found", nil))
+
+        expect { described_class.verify_default_credentials("openshiftv3", 8443, {:path => "/oapi"}) }.to raise_error(MiqException::Error, "Unsupported OpenShift version")
+      end
+    end
+  end
+
   it "#catalog_types" do
     ems = FactoryBot.create(:ems_openshift)
     expect(ems.catalog_types).to include("generic_container_template")

spec/spec_helper.rb

@@ -7,7 +7,7 @@
 Dir[ManageIQ::Providers::Kubernetes::Engine.root.join("spec/support/**/*.rb")].each { |f| require f }
 Dir[File.join(__dir__, "support/**/*.rb")].each { |f| require f }
 
-require "manageiq-providers-openshift"
+require "manageiq/providers/openshift"
 
 VCR.configure do |config|
   config.ignore_hosts 'codeclimate.com' if ENV['CI']