configgin 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d5e487bb265d0c63dbbb33253b00c6f5def25b4
-  data.tar.gz: 69b56e76b7779dd0b289b10c7d9943fd7ea5b17b
+  metadata.gz: 593236064eaa183069525e4725950e8bc4f39c0f
+  data.tar.gz: 8b4a9485d62dcd0a64170772b85285679ce25362
 SHA512:
-  metadata.gz: e001f475d66938235aa00c71e1b6aa1b512329abdecc8dadd577a178595d3d31fd45c50c975c0ab81e6a184c1bc613cf7d188ac1155cb95974242d2006b06f80
-  data.tar.gz: cbb37d82c2cb9bfe6ec9742ade58af0aabb31c2e357ea36ce6c85d8216504b01ed7f3fb3be129831e53bf7f8cca9c9e8ca8d0a95376e3810e804c829ef22a90d
+  metadata.gz: 2cb081da7e7eb7468c7d2eb6c109ae430270d37a65d5a0f9ac2de41fc2bc32d6fe9a3f47ca999be61bac1d93dd5f37dbec5bc7bd9fdab1416a7fc3d1c20d0e98
+  data.tar.gz: 5005cc57cc29062bfa89e209b23c56dc870629e0be1b45af05bc950f7b68d55c56526dba3b6cce814e255968e9978aa54337744c3e32386f5f21ac62849c823d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configgin (0.13.0)
+    configgin (0.14.0)
       bosh-template (~> 2.0)
       deep_merge (~> 1.1)
       kubeclient (~> 2.0)
@@ -41,7 +41,7 @@ GEM
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    public_suffix (3.0.0)
+    public_suffix (3.0.1)
     rainbow (2.1.0)
     rake (10.4.2)
     recursive-open-struct (1.0.0)

data/lib/configgin/version.rb

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

data/lib/kube_link_generator.rb

@@ -32,12 +32,16 @@ class KubeLinkSpecs
     index.chars.map { |c| chars.index(c) }.reduce(0) { |v, c| v * chars.length + c }
   end
 
+  def _get_pods_for_role(role_name)
+    @client.get_pods(namespace: @namespace, label_selector: "skiff-role-name=#{role_name}")
+  end
+
   def get_pods_for_role(role_name, wait_for_ip)
     loop do
       # The 30.times loop exists to print out status messages
       30.times do
         1.times do
-          pods = @client.get_pods(namespace: @namespace, label_selector: "skiff-role-name=#{role_name}")
+          pods = _get_pods_for_role(role_name)
           if wait_for_ip
             # Wait until all pods have IP addresses and properties
             break unless pods.all? { |pod| pod.status.podIP }
@@ -55,7 +59,7 @@ class KubeLinkSpecs
     end
   end
 
-  def get_pod_instance_info(pod, job)
+  def get_pod_instance_info(pod, job, pods_per_image)
     index = pod_index(pod.metadata.name)
     properties = JSON.parse(pod.metadata.annotations['skiff-exported-properties'])
     {
@@ -65,10 +69,26 @@ class KubeLinkSpecs
       'az' => pod.metadata.annotations['failure-domain.beta.kubernetes.io/zone'] || 'az0',
       'address' => pod.status.podIP,
       'properties' => properties.fetch(job, {}),
-      'bootstrap' => index.zero?
+      'bootstrap' => pods_per_image[pod.metadata.uid] < 2
     }
   end
 
+  # Return the number of pods for each image
+  def get_pods_per_image(pods)
+    result = {}
+    sets = Hash.new(0)
+    keys = {}
+    pods.each do |pod|
+      key = pod.status.containerStatuses.map(&:imageID).sort.join("\n")
+      sets[key] += 1
+      keys[pod.metadata.uid] = key
+    end
+    pods.each do |pod|
+      result[pod.metadata.uid] = sets[keys[pod.metadata.uid]]
+    end
+    result
+  end
+
   def get_svc_instance_info(role_name, job)
     svc = @client.get_service(role_name, @namespace)
     pod = get_pods_for_role(role_name, false).first
@@ -98,7 +118,8 @@ class KubeLinkSpecs
     if provider['role'] == this_name
       $stderr.puts "Resolving link #{key} via self provider #{provider}"
       pods = get_pods_for_role(provider['role'], true)
-      instances = pods.map { |p| get_pod_instance_info(p, provider['job']) }
+      pods_per_image = get_pods_per_image(pods)
+      instances = pods.map { |p| get_pod_instance_info(p, provider['job'], pods_per_image) }
     else
       # 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}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configgin
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler