Merge pull request #134 from movableink/dschulze/sc-180267/fix-service-discovery-for-k8s-clients

fix EC2 placement zone retrieval [sc-180267]

Author: duncaan

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.11.4)
+    MovableInkAWS (2.11.5)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)

lib/movable_ink/aws/ec2.rb

@@ -161,7 +161,7 @@ def map_k8s_consul_endpoint(endpoint, role)
               value: role
             }
           ],
-          placement: { availability_zone: nil }
+          placement: { availability_zone: endpoint.Service.dig('Meta', 'external-k8s-topology-zone') }
         })
       end
 

lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.11.4'
+    VERSION = '2.11.5'
   end
 end

spec/ec2_spec.rb

@@ -418,6 +418,7 @@
               "Meta": {
                 "external-source": "kubernetes",
                 "external-k8s-ns": "default",
+                "external-k8s-topology-zone": "us-east-1a",
               }
             }
           }
@@ -484,7 +485,7 @@
          expect(roles_tag[:value]).to eq('kubernetes-service-name')
          expect(backend.instance_id).to eq(nil)
          expect(backend.private_ip_address).to eq('10.0.0.1')
-         expect(backend.private_ip_address).to eq('10.0.0.1')
+         expect(backend.placement[:availability_zone]).to eq('us-east-1a')
       end
     end