configgin 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 60cdde3fbe7af2e13c3b88bc4fbf23272138a0e9daa2594c8fb78180826d9ea4
-  data.tar.gz: 51f1407c62eea893b75666e5be965b44e76d34a31abae10c26b9233e729e8ad6
+SHA1:
+  metadata.gz: 43e19eea72947ae70b880640570aea9d8cca1ee0
+  data.tar.gz: cb47f254ee03495870310f5369d7b19adb0df853
 SHA512:
-  metadata.gz: 18a98c9236e89c31f2c3d1269992e88f8de577dc7036cbbe379fbae0fcd499d841e4ee1b7ccb5757d1ffd669d5aa599c815e38e59e2b761179a6282573f6ff29
-  data.tar.gz: 99b83d2c8f0e1ae7c5478dc9978b27ef16e2b54089ce4fef0d4e35bb440592c386ea836575e8c1c1e0342d6ed1fd1bb23efd024f6a5cc5c045f80bb9ebe02689
+  metadata.gz: 66e6ec7d3c5c40e9caa6fe64c91bb588d0ed18912433c811e45f1d9ffc13667db6ba9bb9e5aac86440740701d3f1849105b58108caf49d62f9b1671be92c9174
+  data.tar.gz: a53834220ffa572251ad3ed24674eb2620101720a3feadc7410d406574ded1ddf18ac1e94cf41e584ba82783c54ce76cec5fc1c1b2505d39583b25d180113b30

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configgin (0.15.2)
+    configgin (0.16.0)
       bosh-template (~> 2.0)
       deep_merge (~> 1.1)
       kubeclient (~> 2.0)

data/bin/configgin

@@ -65,13 +65,12 @@ job_configs.each do |job, job_config|
   jobs[job] = Job.new(bosh_spec, kube_namespace, kube_client, kube_client_stateful_set)
 end
 
-jobs.each do |name, job|
-  kube_client.patch_pod(
-    ENV['HOSTNAME'],
-    { metadata: { annotations: { :"skiff-exported-properties-#{name}" => job.exported_properties.to_json } } },
-    kube_namespace
-  )
-end
+exported_properties = Hash[jobs.map { |name, job| [name, job.exported_properties] }]
+kube_client.patch_pod(
+  ENV['HOSTNAME'],
+  { metadata: { annotations: { :'skiff-exported-properties' => exported_properties.to_json } } },
+  kube_namespace
+)
 
 jobs.each do |job_name, job|
   dns_encoder = KubeDNSEncoder.new(job.spec['links'])

data/lib/configgin/version.rb

@@ -1,3 +1,3 @@
 module Configgin
-  VERSION = '0.15.2'.freeze
+  VERSION = '0.16.0'.freeze
 end

data/lib/kube_link_generator.rb

@@ -37,7 +37,7 @@ class KubeLinkSpecs
     @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, wait_for_ip)
     loop do
       # The 30.times loop exists to print out status messages
       30.times do
@@ -46,34 +46,30 @@ class KubeLinkSpecs
           if wait_for_ip
             # 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}"] }
+            break unless pods.all? { |pod| pod.metadata.annotations['skiff-exported-properties'] }
           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}"] }
+            pods.select! { |pod| pod.metadata.annotations['skiff-exported-properties'] }
           end
           return pods unless pods.empty?
         end
         sleep 1
       end
-      $stdout.puts "Waiting for pods for role #{role_name} and provider job #{job} (at #{Time.now})..."
+      $stdout.puts "Waiting for pods for role #{role_name} (at #{Time.now})..."
     end
   end
 
-  def get_exported_properties(pod, job)
-    exported_properties = pod.metadata.annotations["skiff-exported-properties-#{job}"]
-    exported_properties.nil? ? {} : JSON.parse(exported_properties)
-  end
-
   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'])
     {
       'name' => pod.metadata.name,
       'index' => index,
       'id' => pod.metadata.name,
       'az' => pod.metadata.annotations['failure-domain.beta.kubernetes.io/zone'] || 'az0',
       'address' => pod.status.podIP,
-      'properties' => get_exported_properties(pod, job),
+      'properties' => properties.fetch(job, {}),
       'bootstrap' => pods_per_image[pod.metadata.uid] < 2
     }
   end
@@ -84,11 +80,9 @@ 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
+      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]]
@@ -98,21 +92,23 @@ class KubeLinkSpecs
 
   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
+    pod = get_pods_for_role(role_name, false).first
+    properties = JSON.parse(pod.metadata.annotations['skiff-exported-properties'])
     {
       'name' => svc.metadata.name,
       'index' => 0, # Completely made up index; there is only ever one service
       'id' => svc.metadata.name,
       'az' => pod.metadata.annotations['failure-domain.beta.kubernetes.io/zone'] || 'az0',
       'address' => svc.spec.clusterIP,
-      'properties' => get_exported_properties(pod, job),
+      'properties' => properties.fetch(job, {}),
       'bootstrap' => true
     }
   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
+    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|
       {
@@ -121,7 +117,7 @@ class KubeLinkSpecs
         'id' => ss.metadata.name,
         'az' => pod.metadata.annotations['failure-domain.beta.kubernetes.io/zone'] || 'az0',
         'address' => "#{ss.metadata.name}-#{i}.#{ss.spec.serviceName}",
-        'properties' => get_exported_properties(pod, job),
+        'properties' => properties.fetch(job, {}),
         'bootstrap' => i.zero?
       }
     end
@@ -146,7 +142,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'], 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']
@@ -160,12 +156,12 @@ class KubeLinkSpecs
     end
 
     @links[key] = {
-      'address' => "#{provider['role']}.#{ENV['KUBE_SERVICE_DOMAIN_SUFFIX']}",
+      'address' => "#{provider['role']}.#{ENV['KUBERNETES_NAMESPACE']}.svc.#{ENV['KUBERNETES_CLUSTER_DOMAIN']}",
       'instance_group' => '',
       'default_network' => '',
       'deployment_name' => @namespace,
-      'domain' => ENV['KUBE_SERVICE_DOMAIN_SUFFIX'],
-      'root_domain' => ENV['KUBE_SERVICE_DOMAIN_SUFFIX'],
+      'domain' => "#{ENV['KUBERNETES_NAMESPACE']}.svc.#{ENV['KUBERNETES_CLUSTER_DOMAIN']}",
+      'root_domain' => "#{ENV['KUBERNETES_NAMESPACE']}.svc.#{ENV['KUBERNETES_CLUSTER_DOMAIN']}",
       'instances' => instances,
       'properties' => instances.first['properties']
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configgin
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - SUSE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-25 00:00:00.000000000 Z
+date: 2018-06-13 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.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A simple cli app in Ruby to generate configurations using BOSH ERB templates