configgin 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 593236064eaa183069525e4725950e8bc4f39c0f
-  data.tar.gz: 8b4a9485d62dcd0a64170772b85285679ce25362
+  metadata.gz: 57e22a993e395b62b0e774967bc18ae370ac25ad
+  data.tar.gz: a7336574e707fdafd1f94700969a221cd9cd7fea
 SHA512:
-  metadata.gz: 2cb081da7e7eb7468c7d2eb6c109ae430270d37a65d5a0f9ac2de41fc2bc32d6fe9a3f47ca999be61bac1d93dd5f37dbec5bc7bd9fdab1416a7fc3d1c20d0e98
-  data.tar.gz: 5005cc57cc29062bfa89e209b23c56dc870629e0be1b45af05bc950f7b68d55c56526dba3b6cce814e255968e9978aa54337744c3e32386f5f21ac62849c823d
+  metadata.gz: c8a346691d24d176cb5d3ab5baa34050467d60380acb30d1fd9116cf20a1c237bc0674174692ebb4edd8b12fc9427c938ac6ac732141f1639fbdd659ac977283
+  data.tar.gz: 4621b053cc303f2c4aa82b9fe8b0007339fd2c78bd608b71d3b1843723e84bdb49ab9839f6386f4b534dbe1750573b5b32bb102ca544d37bc005dfee7af8f770

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configgin (0.14.0)
+    configgin (0.14.1)
       bosh-template (~> 2.0)
       deep_merge (~> 1.1)
       kubeclient (~> 2.0)
@@ -16,11 +16,11 @@ GEM
     ast (2.3.0)
     bosh-template (2.0.0)
       semi_semantic (~> 1.2.0)
-    deep_merge (1.1.1)
+    deep_merge (1.2.1)
     diff-lcs (1.3)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    http (0.9.8)
+    http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
@@ -29,9 +29,9 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
-    kubeclient (2.5.1)
-      http (= 0.9.8)
-      recursive-open-struct (= 1.0.0)
+    kubeclient (2.5.2)
+      http (>= 0.98, < 3)
+      recursive-open-struct (~> 1.0.0)
       rest-client
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -44,7 +44,7 @@ GEM
     public_suffix (3.0.1)
     rainbow (2.1.0)
     rake (10.4.2)
-    recursive-open-struct (1.0.0)
+    recursive-open-struct (1.0.5)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
@@ -72,7 +72,7 @@ GEM
     semi_semantic (1.2.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     unicode-display_width (1.2.1)
 
 PLATFORMS
@@ -86,4 +86,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.14.6
+   1.15.1

data/bin/configgin

@@ -33,6 +33,19 @@ kube_client = Kubeclient::Client.new(
     bearer_token: File.read("#{SVC_ACC_PATH}/token")
   }
 )
+kube_client_stateful_set = Kubeclient::Client.new(
+  URI::HTTPS.build(host: ENV['KUBERNETES_SERVICE_HOST'],
+                   port: ENV['KUBERNETES_SERVICE_PORT_HTTPS'],
+                   path: '/apis/apps'),
+  'v1beta1',
+  ssl_options: {
+    ca_file: "#{SVC_ACC_PATH}/ca.crt",
+    verify_ssl: OpenSSL::SSL::VERIFY_PEER
+  },
+  auth_options: {
+    bearer_token: File.read("#{SVC_ACC_PATH}/token")
+  }
+)
 kube_namespace = File.read("#{SVC_ACC_PATH}/namespace")
 
 jobs = {}
@@ -49,7 +62,7 @@ job_configs.each do |job, job_config|
     exit 1
   end
 
-  jobs[job] = Job.new(bosh_spec, kube_namespace, kube_client)
+  jobs[job] = Job.new(bosh_spec, kube_namespace, kube_client, kube_client_stateful_set)
 end
 
 exported_properties = Hash[jobs.map { |name, job| [name, job.exported_properties] }]

data/lib/configgin/version.rb

@@ -1,3 +1,3 @@
 module Configgin
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

data/lib/job.rb

@@ -4,11 +4,11 @@ require_relative 'kube_link_generator'
 
 # Job describes a single BOSH job
 class Job
-  def initialize(spec, namespace, client)
+  def initialize(spec, namespace, client, client_stateful_set)
     @spec = spec
     @namespace = namespace
     @client = client
-    @spec['links'] = KubeLinkSpecs.new(@spec, @namespace, @client)
+    @spec['links'] = KubeLinkSpecs.new(@spec, @namespace, @client, client_stateful_set)
   end
 
   attr_reader :spec

data/lib/kube_link_generator.rb

@@ -8,9 +8,10 @@ class KubeLinkSpecs
   # ANNOTATION_AZ is the Kube annotation for the (availability) zone
   ANNOTATION_AZ = 'failure-domain.beta.kubernetes.io/zone'.freeze
 
-  def initialize(spec, namespace, kube_client)
+  def initialize(spec, namespace, kube_client, kube_client_stateful_set)
     @links = {}
     @client = kube_client
+    @client_stateful_set = kube_client_stateful_set
     @namespace = namespace
     @spec = spec || {}
   end
@@ -104,6 +105,31 @@ class KubeLinkSpecs
     }
   end
 
+  def get_statefulset_instance_info(role_name, job)
+    ss = @client_stateful_set.get_stateful_set(role_name, @namespace)
+    pod = get_pods_for_role(role_name, false).first
+    properties = JSON.parse(pod.metadata.annotations['skiff-exported-properties'])
+
+    Array.new(ss.spec.replicas) do |i|
+      {
+        'name' => ss.metadata.name,
+        'index' => i,
+        'id' => ss.metadata.name,
+        'az' => pod.metadata.annotations['failure-domain.beta.kubernetes.io/zone'] || 'az0',
+        'address' => "#{ss.metadata.name}-#{i}.#{ss.spec.serviceName}",
+        'properties' => properties.fetch(job, {}),
+        'bootstrap' => i.zero?
+      }
+    end
+  end
+
+  def service?(role_name)
+    @client.get_service(role_name, @namespace)
+    true
+  rescue KubeException
+    false
+  end
+
   def [](key)
     return @links[key] if @links.key? key
 
@@ -120,10 +146,14 @@ class KubeLinkSpecs
       pods = get_pods_for_role(provider['role'], true)
       pods_per_image = get_pods_per_image(pods)
       instances = pods.map { |p| get_pod_instance_info(p, provider['job'], pods_per_image) }
-    else
+    elsif service? provider['role']
       # Getting pods for a different service; since we have kube services, we don't handle it in configgin
       $stderr.puts "Resolving link #{key} via service #{provider}"
       instances = [get_svc_instance_info(provider['role'], provider['job'])]
+    else
+      # If there's no service associated, check the statefulset instead
+      $stderr.puts "Resolving link #{key} via statefulset #{provider}"
+      instances = get_statefulset_instance_info(provider['role'], provider['job'])
     end
 
     @links[key] = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configgin
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A simple cli app in Ruby to generate configurations using BOSH ERB templates