resque-kubernetes 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a5d6e3560f6a7393489b6fe7509e0777e2d60b6
-  data.tar.gz: bf7ea17b439598dc9ac2946138178dc61eaedf42
+  metadata.gz: 321b2f65c516afb26286042a67b215dfbf2d44c4
+  data.tar.gz: 55b3b5e011fc5b568bae8a4f573a861cdf84ac5a
 SHA512:
-  metadata.gz: 0066365884c83d8479316ddbb340e50222496a6eabf7fc75822ad0d9088c92375bd285c5049fb9566d7c6524575ee0786637eb12f53c46de5fdb2262283279ee
-  data.tar.gz: c339b564294da1834720fe92a916f82c2b05b110c6c32e30882c3eb65883499862215116aa259fe7b84b27d057d578041daf115627be9f377c5edbd3621b439e
+  metadata.gz: ab929f4e0dfead17f4da7bc4c56eb83f467989c2a2c7b731bfbb66c1300786044802e5b2adac3b3f08440a1a5f7e8d71a3891727f5d4f61256fd5baa84941668
+  data.tar.gz: 0edaf03ca3bb8cc25cfd464105dbf9370232aa8a3525f79694bfc43c2a8c04fa127b1b1811cbae8f04590bf5f1797f6065b1241eac0182c372c766fd6301272c

data/lib/resque/kubernetes/job.rb

@@ -29,22 +29,35 @@ module Resque
 
       def client(scope)
         kubeconfig = File.join(ENV["HOME"], ".kube", "config")
+        # TODO: Add ability to load this from config
+        context = nil
 
         if File.exist?("/var/run/secrets/kubernetes.io/serviceaccount/token")
-          # When running in k8s cluster, use the service account secret token
-          auth_options = {bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"}
-          @jobs_client = Kubeclient::Client.new("https://localhost:8443/apis/batch" , "v1", auth_options: auth_options)
+          # When running in GKE/k8s cluster, use the service account secret token and ca bundle
+          context = new Kubeclient::Config::Context(
+              "https://kubernetes",
+              "v1",
+              {ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"},
+              {bearer_token_file: "/var/run/secrets/kubernetes.io/serviceaccount/token"}
+          )
         elsif File.exist?(kubeconfig)
-          # When running in development, use the config file for `kubectl`
+          # When running in development, use the config file for `kubectl` and default application credentials
           kubeconfig = File.join(ENV["HOME"], ".kube", "config")
-          config = Kubeclient::Config.read(kubeconfig)
-          Kubeclient::Client.new(
-              config.context.api_endpoint + scope,
+          config     = Kubeclient::Config.read(kubeconfig)
+          context    = Kubeclient::Config::Context.new(
+              config.context.api_endpoint,
               config.context.api_version,
-              {
-                  ssl_options: config.context.ssl_options,
-                  auth_options: {use_default_gcp: true}
-              }
+              config.context.ssl_options,
+              {use_default_gcp: true}
+          )
+        end
+
+        if context
+          Kubeclient::Client.new(
+              context.api_endpoint + scope,
+              context.api_version,
+              ssl_options: context.ssl_options,
+              auth_options: context.auth_options,
           )
         end
       end

data/lib/resque/kubernetes/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Kubernetes
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/resque/kubernetes.rb

@@ -8,7 +8,7 @@ module Resque
     extend Configurable
 
     # By default only manage kubernetes jobs in :production
-    define_setting :environments, [:production]
+    define_setting :environments, ["production"]
 
     # Limit the number of workers that should be spun up, default 10
     define_setting :max_workers, 10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-kubernetes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Wadsack