rancher-metadata 0.17.6 → 0.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38c14d5544623d8b458cf07d755076ee1ab17d3b
-  data.tar.gz: 26551f94119a6e2138bf661117d288448f9cd169
+  metadata.gz: 58557aa34fbd096e4379591f47e3892703f2060f
+  data.tar.gz: 08228fefab2525dee8cc44d98203ad24621a21f7
 SHA512:
-  metadata.gz: 24e2407029c80893a31afe03985e11053bc1b85e1ec38fb4367293ad4985f5d1e929ed84e4215bfcac6c382b170ceb8f34b59874bafb42295933ba418b2ea06f
-  data.tar.gz: 7d29af0125a22396877c5191971b34fc2e0febc5714f19857179454d23f5c4ab8af6e78a718a63795ad52729bdc594c13951ef09f1d87e96d1f946c4f95908af
+  metadata.gz: c49a47f8c5e682230e7e34051830ac1502ff449dd61a8179aa830f3b3810e881eb1d1d9144341d789d3a65d0e83efba27b454ba4732cc3f41fb83c80db738ef7
+  data.tar.gz: 04152d95bf737f16503a33f0619f473151345f37252dd98f46818169077c7c9166358f16c41165576fc760be058c8065b308f6561680ef530febfba2fc42df25

data/lib/rancher-metadata/api.rb

@@ -100,7 +100,16 @@ module RancherMetadata
     end
 
     def get_service_containers(service = {})
-      self.get_service_field("containers", service)
+      containers = {}
+
+      self.get_service_field("containers", service).each do |container|
+        containers[container['name']] = container
+
+        # FIXME: until https://github.com/rancher/cattle/pull/1197 gets merged
+        containers[container['name']]['service_suffix'] = self.get_container_service_suffix(container['name']) unless container.has_key?('service_suffix')
+      end
+
+      containers
     end
 
     def get_service_metadata(service = {})
@@ -119,8 +128,11 @@ module RancherMetadata
         containers = self.get_service_containers(service)
         new = containers.keys()
 
-        (new - old).each do |n|
-          yield(n, containers[n])
+        (new - old).each do |container_name|
+          # FIXME: until https://github.com/rancher/cattle/pull/1197 gets merged
+          containers[container_name]['service_suffix'] = self.get_container_service_suffix(container_name) unless containers[container_name].has_key?('service_suffix')
+
+          yield(container_name, containers[container_name])
         end
 
         old = new
@@ -156,7 +168,7 @@ module RancherMetadata
         container = self.api_get("/self/container")
       end
 
-      # FIXME: https://github.com/rancher/cattle/pull/1197
+      # FIXME: until https://github.com/rancher/cattle/pull/1197 gets merged
       container['service_suffix'] = self.get_container_service_suffix(container_name) unless container.has_key?('service_suffix')
 
       container
@@ -177,6 +189,7 @@ module RancherMetadata
 
     def get_container_ip(container_name = nil)
       if container_name
+      # are we running within the rancher managed network?
         # FIXME: https://github.com/rancher/rancher/issues/2750
         if self.is_network_managed?
           self.api_get("/self/container/primary_ip")

data/lib/rancher-metadata/version.rb

@@ -5,7 +5,7 @@
 #
 
 module RancherMetadata
-  VERSION = "0.17.6"
+  VERSION = "0.17.8"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rancher-metadata
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: 0.17.8
 platform: ruby
 authors:
 - Matteo Cerutti