Merge pull request hashicorp#272 from hashicorp/alias-check

Fix bug with defining connect healthcheck
duckhan · Jun 8, 2020 · 5a98720 · 5a98720
2 parents 140068c + b9404c2
commit 5a98720
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/connect-inject/container_init.go b/connect-inject/container_init.go
@@ -323,7 +323,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "{{ .ServiceName }}"
+    alias_service = "${SERVICE_ID}"
   }
 }
 

diff --git a/connect-inject/container_init_test.go b/connect-inject/container_init_test.go
@@ -77,7 +77,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -132,7 +132,7 @@ cp /bin/consul /consul/connect-inject/consul`,
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -304,7 +304,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -350,7 +350,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -396,7 +396,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -443,7 +443,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -502,7 +502,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -635,7 +635,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -703,7 +703,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -772,7 +772,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -850,7 +850,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -928,7 +928,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }
 
@@ -1010,7 +1010,7 @@ services {
 
   checks {
     name = "Destination Alias"
-    alias_service = "web"
+    alias_service = "${SERVICE_ID}"
   }
 }