Merge pull request #2979 from zendesk/jylee/whitelistmetricsserver

read apiVersion from yml files

plugins/kubernetes/app/controllers/kubernetes/clusters_controller.rb

@@ -107,16 +107,20 @@ def update_secret(namespace)
     }
 
     if secret_exist?(secret)
-      @cluster.client.update_secret(secret)
+      secrets_client.update_secret(secret)
     else
-      @cluster.client.create_secret(secret)
+      secrets_client.create_secret(secret)
     end
   end
 
   def secret_exist?(secret)
-    @cluster.client.get_secret(secret.fetch(:metadata).fetch(:name), secret.fetch(:metadata).fetch(:namespace))
+    secrets_client.get_secret(secret.fetch(:metadata).fetch(:name), secret.fetch(:metadata).fetch(:namespace))
     true
   rescue *SamsonKubernetes.connection_errors
     false
   end
+
+  def secrets_client
+    @cluster.client('v1')
+  end
 end

plugins/kubernetes/app/models/kubernetes/cluster.rb

@@ -19,7 +19,7 @@ class Cluster < ActiveRecord::Base
 
     before_destroy :ensure_unused
 
-    def client(type = :default)
+    def client(type)
       (@client ||= {})[type] ||= build_client(type)
     end
 
@@ -28,43 +28,39 @@ def context
     end
 
     def namespaces
-      client.get_namespaces.fetch(:items).map { |ns| ns.dig(:metadata, :name) } - %w[kube-system]
+      client('v1').get_namespaces.fetch(:items).map { |ns| ns.dig(:metadata, :name) } - %w[kube-system]
     end
 
     def kubeconfig
       @kubeconfig ||= Kubeclient::Config.read(config_filepath)
     end
 
     def schedulable_nodes
-      nodes = client.get_nodes.fetch(:items)
+      nodes = client('v1').get_nodes.fetch(:items)
       nodes.reject { |n| n.dig(:spec, :unschedulable) }
-    rescue
+    rescue *SamsonKubernetes.connection_errors
       Rails.logger.error("Error loading nodes from cluster #{id}: #{$!}")
       []
     end
 
     def server_version
       version = Rails.cache.fetch(cache_key, expires_in: 1.hour) do
-        JSON.parse(client.create_rest_client('version').get.body).fetch('gitVersion')[1..-1]
+        JSON.parse(client('v1').create_rest_client('version').get.body).fetch('gitVersion')[1..-1]
       end
       Gem::Version.new(version)
     end
 
     private
 
     def connection_valid?
-      client.api_valid?
+      client('v1').api_valid?
     rescue *SamsonKubernetes.connection_errors
       false
     end
 
     def build_client(type)
       endpoint = context.api_endpoint
-      if type == :default
-        type = context.api_version
-      else
-        endpoint = endpoint.sub(/\/api$/, '') + '/apis'
-      end
+      endpoint += '/apis' unless type.match? /^v\d+/ # TODO: remove by fixing via https://github.com/abonas/kubeclient/issues/284
 
       Kubeclient::Client.new(
         endpoint,

plugins/kubernetes/app/models/kubernetes/deploy_executor.rb

@@ -184,7 +184,7 @@ def print_resource_events(doc)
           selector << "involvedObject.uid=#{uid}"
         end
 
-        events = doc.deploy_group.kubernetes_cluster.client.get_events(
+        events = doc.deploy_group.kubernetes_cluster.client('v1').get_events(
           namespace: resource.namespace,
           field_selector: selector.join(',')
         ).fetch(:items)

plugins/kubernetes/app/models/kubernetes/release.rb

@@ -59,7 +59,7 @@ def clients
         ]
       end
       # avoiding doing a .uniq on clients which might do weird stuff
-      scopes.uniq.map { |group, query| [group.kubernetes_cluster.client, query] }
+      scopes.uniq.map { |group, query| [group.kubernetes_cluster.client('v1'), query] }
     end
 
     def url

plugins/kubernetes/app/models/kubernetes/resource.rb

@@ -211,11 +211,11 @@ def request(method, *args)
       end
 
       def client
-        pod_client
+        @deploy_group.kubernetes_cluster.client(@template.fetch(:apiVersion))
       end
 
       def pod_client
-        @deploy_group.kubernetes_cluster.client
+        @deploy_group.kubernetes_cluster.client('v1')
       end
 
       def loop_sleep
@@ -241,11 +241,6 @@ class ConfigMap < Base
     end
 
     class HorizontalPodAutoscaler < Base
-      private
-
-      def client
-        @deploy_group.kubernetes_cluster.client('autoscaling/v1')
-      end
     end
 
     class Service < Base
@@ -286,10 +281,6 @@ def request_delete
         # delete the actual deployment
         super
       end
-
-      def client
-        @deploy_group.kubernetes_cluster.client('extensions/v1beta1')
-      end
     end
 
     class DaemonSet < Base
@@ -357,10 +348,6 @@ def pods_count
         resource.dig_fetch(:status, :currentNumberScheduled) + resource.dig_fetch(:status, :numberMisscheduled)
       end
 
-      def client
-        @deploy_group.kubernetes_cluster.client('extensions/v1beta1')
-      end
-
       def wait_for_termination_of_all_pods
         30.times do
           loop_sleep
@@ -421,10 +408,6 @@ def with_patch_header
       ensure
         client.headers['Content-Type'] = old
       end
-
-      def client
-        @deploy_group.kubernetes_cluster.client('apps/v1beta1')
-      end
     end
 
     class Job < Base
@@ -444,18 +427,9 @@ def revert(_previous)
       def request_delete
         delete_pods { super }
       end
-
-      def client
-        @deploy_group.kubernetes_cluster.client('batch/v1')
-      end
     end
 
     class CronJob < Base
-      private
-
-      def client
-        @deploy_group.kubernetes_cluster.client('batch/v1beta1')
-      end
     end
 
     class Pod < Base
@@ -471,12 +445,6 @@ def deploy
         delete
         create unless @template[:delete] # allow deletion through release_doc logic
       end
-
-      private
-
-      def client
-        @deploy_group.kubernetes_cluster.client('policy/v1beta1')
-      end
     end
 
     def self.build(*args)

plugins/kubernetes/app/models/kubernetes/role_validator.rb

@@ -24,6 +24,7 @@ def validate
       validate_name
       validate_namespace
       validate_kinds
+      validate_api_version
       validate_containers
       validate_container_name
       validate_job_restart_policy
@@ -85,6 +86,10 @@ def validate_kinds
         ", supported combinations are: #{supported} and #{IGNORED.join(", ")}"
     end
 
+    def validate_api_version
+      @errors << "Needs apiVersion specified" if map_attributes([:apiVersion]).any?(&:nil?)
+    end
+
     # spec actually allows this, but blows up when used
     def validate_numeric_limits
       [:requests, :limits].each do |scope|

plugins/kubernetes/app/models/kubernetes/template_filler.rb

@@ -471,7 +471,7 @@ def set_image_pull_secrets
 
       docker_credentials = Rails.cache.fetch(["docker_credentials", cluster], expires_in: 1.hour) do
         secrets = SamsonKubernetes.retry_on_connection_errors do
-          cluster.client.get_secrets(namespace: template.dig_fetch(:metadata, :namespace)).fetch(:items)
+          cluster.client('v1').get_secrets(namespace: template.dig_fetch(:metadata, :namespace)).fetch(:items)
         end
         secrets.
           select { |secret| docker_configs.include? secret.fetch(:type) }.

plugins/kubernetes/app/views/kubernetes/clusters/show.html.erb

@@ -25,7 +25,7 @@
   <div class="form-group">
     <label class="col-lg-2 control-label">URL</label>
     <div class="col-lg-4">
-      <p class="form-control-static"><%= @cluster.client.api_endpoint %></p>
+      <p class="form-control-static"><%= @cluster.client('v1').api_endpoint %></p>
     </div>
   </div>
 

plugins/kubernetes/test/controllers/kubernetes/clusters_controller_test.rb

@@ -21,7 +21,7 @@ def self.use_example_config
       end
 
       it "renders capacity" do
-        stub_request(:get, "http://foobar.server/api/v1/nodes").to_return(body: "[]")
+        stub_request(:get, "http://foobar.server/api/v1/nodes").to_return(body: {items: []}.to_json)
         get :index, params: {capacity: true}
         assert_template :index
       end

plugins/kubernetes/test/models/kubernetes/api/pod_test.rb

@@ -35,7 +35,7 @@
   let(:pod_with_client) do
     Kubernetes::Api::Pod.new(
       pod_attributes,
-      client: deploy_groups(:pod1).kubernetes_cluster.client
+      client: deploy_groups(:pod1).kubernetes_cluster.client('v1')
     )
   end
   let(:start_time) { "2017-03-31T22:56:20Z" }

plugins/kubernetes/test/models/kubernetes/cluster_test.rb

@@ -60,11 +60,11 @@
 
   describe '#client' do
     it 'creates a client' do
-      cluster.client.must_be_kind_of Kubeclient::Client
+      cluster.client('v1').must_be_kind_of Kubeclient::Client
     end
 
     it 'caches' do
-      cluster.client.object_id.must_equal cluster.client.object_id
+      cluster.client('v1').object_id.must_equal cluster.client('v1').object_id
     end
 
     it 'can build for other types' do

plugins/kubernetes/test/models/kubernetes/deploy_executor_test.rb

@@ -269,6 +269,7 @@ def worker_is_unstable
         Kubernetes::ReleaseDoc.any_instance.unstub(:raw_template)
         GitRepository.any_instance.stubs(:file_content).with('kubernetes/resque_worker.yml', commit).returns({
           'kind' => 'Job',
+          'apiVersion' => 'batch/v1',
           'spec' => {
             'template' => {
               'metadata' => {'labels' => {'project' => 'foobar', 'role' => 'migrate'}},
@@ -508,6 +509,7 @@ def worker_is_unstable
       it "rolls back when previous resource existed" do
         old = {
           kind: 'Service',
+          apiVersion: 'v1',
           metadata: {uid: '123', name: 'some-project', namespace: 'staging', resourceVersion: 'X'},
           spec: {clusterIP: "Y"}
         }