configgin 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7725554be470eca87c54a1c24b22e16117d0083d9223c549a8b9bdeea7f9958e
-  data.tar.gz: 172a52159cef690d16f24d02e41b68a481d024669f91f88b3301e68800f425e5
+SHA1:
+  metadata.gz: ce88507cf9921fba1b59321f1b5cc777ebe874a1
+  data.tar.gz: 4752bef9f47dc92651ec4ac8dab3ae2f22841c87
 SHA512:
-  metadata.gz: cd13971b2d26e671805468425bfe83b9c30852e1a0c316ac8db868def5e00e9c1db48a6d5b87112282d389b9bc5f0377e9b3260babf063083b15eabc6000ca08
-  data.tar.gz: 0b1f7c8766a4751dc31cc6b5a9f300d69e8cd4f08d02f4acb81804370fd2085f39475d928802e83e356735d4c778ea15ddb25a9e6ff573433d57479bbb3e30a7
+  metadata.gz: 3073e869b142653a23b8d98cff2bf9e414895093d664a460371ab92827726cd01d5bb294466f58b7b8bd574bdb63e2a73ab4211b7afff85c16bcd6d584f6437b
+  data.tar.gz: 5797e37cf29d5ec1cce8f3df9b170cc5969d73d11db8ca17fea6520e824f49a114686c7ae17450861b7b4ab1ebcfffeb29dd5ef0a062250f1f840b0f6e66e675

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configgin (0.16.2)
+    configgin (0.16.3)
       bosh-template (~> 2.0)
       deep_merge (~> 1.1)
       kubeclient (~> 2.0)
@@ -14,7 +14,7 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
-    bosh-template (2.1.0)
+    bosh-template (2.2.0)
       semi_semantic (~> 1.2.0)
     deep_merge (1.2.1)
     diff-lcs (1.3)
@@ -33,15 +33,15 @@ GEM
       http (>= 0.98, < 3)
       recursive-open-struct (~> 1.0.0)
       rest-client
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mustache (1.0.5)
     netrc (0.11.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rainbow (2.1.0)
     rake (10.4.2)
     recursive-open-struct (1.0.5)
@@ -86,4 +86,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.16.3
+   1.16.1

data/lib/configgin/version.rb

@@ -1,3 +1,3 @@
 module Configgin
-  VERSION = '0.16.2'.freeze
+  VERSION = '0.16.3'.freeze
 end

data/lib/kube_link_generator.rb

@@ -16,8 +16,11 @@ class KubeLinkSpecs
     @spec = spec || {}
   end
 
+  attr_reader :client, :spec, :namespace
+  SLEEP_DURATION = 1
+
   def this_name
-    @spec['job']['name']
+    spec['job']['name']
   end
 
   # pod_index returns a number for the given pod name. The number is expected to
@@ -34,35 +37,43 @@ class KubeLinkSpecs
   end
 
   def _get_pods_for_role(role_name)
-    @client.get_pods(namespace: @namespace, label_selector: "skiff-role-name=#{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, job)
+  def get_pods_for_role(role_name, job, options = {})
     loop do
       # The 30.times loop exists to print out status messages
       30.times do
         1.times do
           pods = _get_pods_for_role(role_name)
-          if wait_for_ip
+          good_pods = pods.select do |pod|
+            next false unless pod.status.podIP
+            next true if pod.metadata.annotations["skiff-exported-properties-#{job}"]
+            # Fall back to non-job-specific properties, for upgrades from older versions
+            pod.metadata.annotations['skiff-exported-properties']
+          end
+
+          if options[:wait_for_all]
             # Wait until all pods have IP addresses and properties
-            break unless pods.all? { |pod| pod.status.podIP }
-            break unless pods.all? { |pod| pod.metadata.annotations["skiff-exported-properties-#{job}"] }
-          else
-            # We just need one pod with exported properties
-            pods.select! { |pod| pod.status.podIP }
-            pods.select! { |pod| pod.metadata.annotations["skiff-exported-properties-#{job}"] }
+            break unless good_pods.length == pods.length
           end
-          return pods unless pods.empty?
+          return good_pods unless good_pods.empty?
         end
-        sleep 1
+        sleep SLEEP_DURATION
       end
       $stdout.puts "Waiting for pods for role #{role_name} and provider job #{job} (at #{Time.now})..."
+      $stdout.flush
     end
   end
 
   def get_exported_properties(pod, job)
-    exported_properties = pod.metadata.annotations["skiff-exported-properties-#{job}"]
-    exported_properties.nil? ? {} : JSON.parse(exported_properties)
+    if pod.metadata.annotations["skiff-exported-properties-#{job}"]
+      JSON.parse(pod.metadata.annotations["skiff-exported-properties-#{job}"])
+    elsif pod.metadata.annotations["skiff-exported-properties"]
+      JSON.parse(pod.metadata.annotations["skiff-exported-properties"])[job]
+    else
+      {}
+    end
   end
 
   def get_pod_instance_info(pod, job, pods_per_image)
@@ -84,11 +95,10 @@ class KubeLinkSpecs
     sets = Hash.new(0)
     keys = {}
     pods.each do |pod|
-      unless pod.status.containerStatuses.nil?
-        key = pod.status.containerStatuses.map(&:imageID).sort.join("\n")
-        sets[key] += 1
-        keys[pod.metadata.uid] = key
-      end
+      next if pod.status.containerStatuses.nil?
+      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]]
@@ -97,8 +107,8 @@ class KubeLinkSpecs
   end
 
   def get_svc_instance_info(role_name, job)
-    svc = @client.get_service(role_name, @namespace)
-    pod = get_pods_for_role(role_name, false, job).first
+    svc = client.get_service(role_name, namespace)
+    pod = get_pods_for_role(role_name, job).first
     {
       'name' => svc.metadata.name,
       'index' => 0, # Completely made up index; there is only ever one service
@@ -111,8 +121,8 @@ 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, job).first
+    ss = @client_stateful_set.get_stateful_set(role_name, namespace)
+    pod = get_pods_for_role(role_name, job).first
 
     Array.new(ss.spec.replicas) do |i|
       {
@@ -128,7 +138,7 @@ class KubeLinkSpecs
   end
 
   def service?(role_name)
-    @client.get_service(role_name, @namespace)
+    client.get_service(role_name, namespace)
     true
   rescue KubeException
     false
@@ -138,7 +148,7 @@ class KubeLinkSpecs
     return @links[key] if @links.key? key
 
     # Resolve the role we're looking for
-    provider = @spec['consumes'][key]
+    provider = spec['consumes'][key]
     unless provider
       $stderr.puts "No link provider found for #{key}"
       return @links[key] = nil
@@ -146,7 +156,7 @@ class KubeLinkSpecs
 
     if provider['role'] == this_name
       $stderr.puts "Resolving link #{key} via self provider #{provider}"
-      pods = get_pods_for_role(provider['role'], true, provider['job'])
+      pods = get_pods_for_role(provider['role'], provider['job'], wait_for_all: true)
       pods_per_image = get_pods_per_image(pods)
       instances = pods.map { |p| get_pod_instance_info(p, provider['job'], pods_per_image) }
     elsif service? provider['role']
@@ -161,9 +171,9 @@ class KubeLinkSpecs
 
     @links[key] = {
       'address' => "#{provider['role']}.#{ENV['KUBERNETES_NAMESPACE']}.svc.#{ENV['KUBERNETES_CLUSTER_DOMAIN']}",
-      'instance_group' => '',
+      'instance_group' => '', # This is probably the role name from the manifest
       'default_network' => '',
-      'deployment_name' => @namespace,
+      'deployment_name' => namespace,
       'domain' => "#{ENV['KUBERNETES_NAMESPACE']}.svc.#{ENV['KUBERNETES_CLUSTER_DOMAIN']}",
       'root_domain' => "#{ENV['KUBERNETES_NAMESPACE']}.svc.#{ENV['KUBERNETES_CLUSTER_DOMAIN']}",
       'instances' => instances,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configgin
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-09-10 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.7.7
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: A simple cli app in Ruby to generate configurations using BOSH ERB templates