configgin 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2a9f4d7934d6daf2749f6a8b3655fbe40bf5029
-  data.tar.gz: dd2fc1734da0c2c1cb9e5421c63cc97649bce6b0
+  metadata.gz: e1b9aa710c1bec620b568e23d36f99c8a50338f1
+  data.tar.gz: 60b40c88b23d1488657e3c4f56b245fe9a111095
 SHA512:
-  metadata.gz: '009e5dd0ca2b3a3e54317fba19f05c8ba64727dd73ce5f039d734236c55c6415258f6fd5107e80a9c7be060815dc779e8c333f1baf0794610c7de6206e7efb1d'
-  data.tar.gz: 7e6670ce466bba34c1d7284ad0788f7d7e0cbd8cf066afbcc98278f7f227cc45993a7a419c21cc776287ce2a53df850a4a4462676aca2f113409b7fa6130f4be
+  metadata.gz: 0a0464ad7102b30f48f93ecd8ca5741c3c3c0104d452cf3f4e1c0bef4bd97236ce55fd7be8c0b3a7d4a8877ce2ca76d3cd481d045466d300c937ef217078b315
+  data.tar.gz: 3365be3c6f141f429a3fb44a6aaae7fdaf6562720d075a1e975ba5d86076435c56ca8ece5c4ee99925ebab2cb4ba20cbb5ffd705f7bcf45beebed9aafd091780

data/bin/configgin

@@ -65,12 +65,13 @@ job_configs.each do |job, job_config|
   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] }]
-kube_client.patch_pod(
-  ENV['HOSTNAME'],
-  { metadata: { annotations: { :'skiff-exported-properties' => exported_properties.to_json } } },
-  kube_namespace
-)
+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
 
 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.0'.freeze
+  VERSION = '0.15.1'.freeze
 end

data/lib/job.rb

@@ -58,7 +58,7 @@ class Job
     # Read the erb template
     begin
       perms = File.stat(input_file_path).mode
-      erb_template = ERB.new(File.read(input_file_path))
+      erb_template = ERB.new(File.read(input_file_path), nil, '-')
       erb_template.filename = input_file_path
     rescue Errno::ENOENT
       raise "failed to read template file #{input_file_path}"

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)
+  def get_pods_for_role(role_name, wait_for_ip, job)
     loop do
       # The 30.times loop exists to print out status messages
       30.times do
@@ -46,30 +46,34 @@ 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'] }
+            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'] }
+            pods.select! { |pod| pod.metadata.annotations["skiff-exported-properties-#{job}"] }
           end
           return pods unless pods.empty?
         end
         sleep 1
       end
-      $stdout.puts "Waiting for pods for role #{role_name} (at #{Time.now})..."
+      $stdout.puts "Waiting for pods for role #{role_name} and provider job #{job} (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' => properties.fetch(job, {}),
+      'properties' => get_exported_properties(pod, job),
       'bootstrap' => pods_per_image[pod.metadata.uid] < 2
     }
   end
@@ -92,23 +96,21 @@ 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).first
-    properties = JSON.parse(pod.metadata.annotations['skiff-exported-properties'])
+    pod = get_pods_for_role(role_name, false, job).first
     {
       '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' => properties.fetch(job, {}),
+      'properties' => get_exported_properties(pod, 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).first
-    properties = JSON.parse(pod.metadata.annotations['skiff-exported-properties'])
+    pod = get_pods_for_role(role_name, false, job).first
 
     Array.new(ss.spec.replicas) do |i|
       {
@@ -117,7 +119,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' => properties.fetch(job, {}),
+        'properties' => get_exported_properties(pod, job),
         'bootstrap' => i.zero?
       }
     end
@@ -142,7 +144,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)
+      pods = get_pods_for_role(provider['role'], true, provider['job'])
       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']

metadata

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