diff --git a/plugins/kubernetes/app/controllers/kubernetes/clusters_controller.rb b/plugins/kubernetes/app/controllers/kubernetes/clusters_controller.rb index 9e4eaa9acb..cbf0ecd905 100644 --- a/plugins/kubernetes/app/controllers/kubernetes/clusters_controller.rb +++ b/plugins/kubernetes/app/controllers/kubernetes/clusters_controller.rb @@ -110,7 +110,7 @@ def update_secret(namespace) def secret_exist?(secret) @cluster.client.get_secret(secret.fetch(:metadata).fetch(:name), secret.fetch(:metadata).fetch(:namespace)) true - rescue KubeException + rescue Kubeclient::HttpError false end end diff --git a/plugins/kubernetes/app/models/kubernetes/api/pod.rb b/plugins/kubernetes/app/models/kubernetes/api/pod.rb index ef9f23ebe1..0f5a62a44d 100644 --- a/plugins/kubernetes/app/models/kubernetes/api/pod.rb +++ b/plugins/kubernetes/app/models/kubernetes/api/pod.rb @@ -61,10 +61,10 @@ def containers # tries to get logs from current or previous pod depending on if it restarted def logs(container, end_time) fetch_logs(container, end_time, previous: restarted?) - rescue KubeException # not found or pod is initializing + rescue Kubeclient::HttpError # not found or pod is initializing begin fetch_logs(container, end_time, previous: !restarted?) - rescue KubeException + rescue Kubeclient::HttpError nil end end diff --git a/plugins/kubernetes/app/models/kubernetes/cluster.rb b/plugins/kubernetes/app/models/kubernetes/cluster.rb index 4bd9353bee..6e8a7710f1 100644 --- a/plugins/kubernetes/app/models/kubernetes/cluster.rb +++ b/plugins/kubernetes/app/models/kubernetes/cluster.rb @@ -45,7 +45,7 @@ def namespaces def namespace_exists?(namespace) connection_valid? && namespaces.include?(namespace) - rescue KubeException + rescue Kubeclient::HttpError false end @@ -63,7 +63,7 @@ def schedulable_nodes def connection_valid? client.api_valid? - rescue KubeException, Errno::ECONNREFUSED + rescue Kubeclient::HttpError, Errno::ECONNREFUSED false end diff --git a/plugins/kubernetes/app/models/kubernetes/deploy_executor.rb b/plugins/kubernetes/app/models/kubernetes/deploy_executor.rb index ef6b837dec..d59e9849d1 100644 --- a/plugins/kubernetes/app/models/kubernetes/deploy_executor.rb +++ b/plugins/kubernetes/app/models/kubernetes/deploy_executor.rb @@ -124,7 +124,7 @@ def pod_statuses(release, release_docs) # efficient pod fetching by querying once per cluster instead of once per deploy group def fetch_pods(release) release.clients.flat_map do |client, query| - pods = Vault.with_retries(KubeException, attempts: 3) { client.get_pods(query) } + pods = Vault.with_retries(Kubeclient::HttpError, attempts: 3) { client.get_pods(query) } pods.map! { |p| Kubernetes::Api::Pod.new(p, client: client) } end end diff --git a/plugins/kubernetes/app/models/kubernetes/resource.rb b/plugins/kubernetes/app/models/kubernetes/resource.rb index d8d6c625c4..784ddf1288 100644 --- a/plugins/kubernetes/app/models/kubernetes/resource.rb +++ b/plugins/kubernetes/app/models/kubernetes/resource.rb @@ -99,7 +99,7 @@ def update def fetch_resource reply = request(:get, name, namespace, as: :raw) JSON.parse(reply, symbolize_names: true) - rescue KubeException => e + rescue Kubeclient::HttpError => e raise e unless e.error_code == 404 nil end diff --git a/plugins/kubernetes/test/models/kubernetes/api/pod_test.rb b/plugins/kubernetes/test/models/kubernetes/api/pod_test.rb index 505c056226..6e46f667c2 100644 --- a/plugins/kubernetes/test/models/kubernetes/api/pod_test.rb +++ b/plugins/kubernetes/test/models/kubernetes/api/pod_test.rb @@ -196,7 +196,7 @@ it "fetches previous logs when current logs are not available" do stub_request(:get, "#{log_url}&follow=true"). - to_raise(KubeException.new('a', 'b', 'c')) + to_raise(Kubeclient::HttpError.new('a', 'b', 'c')) stub_request(:get, "#{log_url}&previous=true"). and_return(body: "HELLO") pod_with_client.logs('some-container', 10.seconds.from_now).must_equal "HELLO" @@ -204,9 +204,9 @@ it "does not crash when both log endpoints fails with a 404" do stub_request(:get, "#{log_url}&follow=true"). - to_raise(KubeException.new('a', 'b', 'c')) + to_raise(Kubeclient::HttpError.new('a', 'b', 'c')) stub_request(:get, "#{log_url}&previous=true"). - to_raise(KubeException.new('a', 'b', 'c')) + to_raise(Kubeclient::HttpError.new('a', 'b', 'c')) pod_with_client.logs('some-container', 10.seconds.from_now).must_be_nil end diff --git a/plugins/kubernetes/test/models/kubernetes/deploy_executor_test.rb b/plugins/kubernetes/test/models/kubernetes/deploy_executor_test.rb index 0b66aebdd3..f98e27fb27 100644 --- a/plugins/kubernetes/test/models/kubernetes/deploy_executor_test.rb +++ b/plugins/kubernetes/test/models/kubernetes/deploy_executor_test.rb @@ -542,8 +542,8 @@ def worker_is_unstable describe "#fetch_pods" do it "retries on failure" do - Kubeclient::Client.any_instance.expects(:get_pods).times(4).raises(KubeException.new(1, 2, 3)) - assert_raises KubeException do + Kubeclient::Client.any_instance.expects(:get_pods).times(4).raises(Kubeclient::HttpError.new(1, 2, 3)) + assert_raises Kubeclient::HttpError do executor.send(:fetch_pods, kubernetes_releases(:test_release)) end end diff --git a/plugins/kubernetes/test/models/kubernetes/release_doc_test.rb b/plugins/kubernetes/test/models/kubernetes/release_doc_test.rb index 03154de7d8..c2d2561556 100644 --- a/plugins/kubernetes/test/models/kubernetes/release_doc_test.rb +++ b/plugins/kubernetes/test/models/kubernetes/release_doc_test.rb @@ -44,7 +44,7 @@ def daemonset_stub(scheduled, misscheduled) let(:doc) { kubernetes_release_docs(:test_release_pod_1) } let(:primary_template) { doc.resource_template[0] } - let(:kube_404) { KubeException.new(404, 2, 3) } + let(:kube_404) { Kubeclient::HttpError.new(404, 2, 3) } let(:service_url) { "http://foobar.server/api/v1/namespaces/pod1/services/some-project" } before do diff --git a/plugins/kubernetes/test/models/kubernetes/resource_test.rb b/plugins/kubernetes/test/models/kubernetes/resource_test.rb index baafa112b4..c981542df5 100644 --- a/plugins/kubernetes/test/models/kubernetes/resource_test.rb +++ b/plugins/kubernetes/test/models/kubernetes/resource_test.rb @@ -104,7 +104,7 @@ def assert_pod_deletion it "raises when a non 404 exception is raised" do stub_request(:get, url).to_return(status: 500) - assert_raises(KubeException) { resource.running? } + assert_raises(Kubeclient::HttpError) { resource.running? } end end @@ -213,7 +213,7 @@ def daemonset_stub(scheduled, misscheduled) end it "deletes and created when daemonset exists without pods" do - client.expects(:get_daemon_set).raises(KubeException.new(404, 'Not Found', {})) + client.expects(:get_daemon_set).raises(Kubeclient::HttpError.new(404, 'Not Found', {})) client.expects(:get_daemon_set).returns(daemonset_stub(0, 0)) client.expects(:delete_daemon_set) client.expects(:create_daemon_set) @@ -222,7 +222,7 @@ def daemonset_stub(scheduled, misscheduled) it "deletes and created when daemonset exists with pods" do client.expects(:update_daemon_set) - client.expects(:get_daemon_set).raises(KubeException.new(404, 'Not Found', {})) + client.expects(:get_daemon_set).raises(Kubeclient::HttpError.new(404, 'Not Found', {})) client.expects(:get_daemon_set).times(4).returns( daemonset_stub(1, 1), # running check daemonset_stub(1, 1), # after update check #1 ... still running @@ -326,7 +326,7 @@ def deployment_stub(replica_count) client.expects(:update_deployment).with do |template| template[:spec][:replicas].must_equal 0 end - client.expects(:get_deployment).raises(KubeException.new(404, 'Not Found', {})) + client.expects(:get_deployment).raises(Kubeclient::HttpError.new(404, 'Not Found', {})) client.expects(:get_deployment).times(3).returns( deployment_stub(3), deployment_stub(3),