Merge pull request #641 from garden-io/fix-multiple-ingresses

fix: use unique names for a service's ingresses
garden-io · Mar 18, 2019 · 06c8206 · 06c8206
2 parents d8ef17a + b1fbb25
commit 06c8206
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/examples/simple-project/services/node-service/garden.yml b/examples/simple-project/services/node-service/garden.yml
@@ -7,6 +7,10 @@ module:
       ports:
         - name: http
           containerPort: 8080
+      healthCheck:
+        httpGet:
+          path: /hello-node
+          port: http
       ingresses:
         - path: /hello-node
           port: http

diff --git a/garden-service/src/plugins/kubernetes/container/ingress.ts b/garden-service/src/plugins/kubernetes/container/ingress.ts
@@ -33,7 +33,7 @@ export async function createIngressResources(
 
   const allIngresses = await getIngressesWithCert(service, api, provider)
 
-  return Bluebird.map(allIngresses, async (ingress) => {
+  return Bluebird.map(allIngresses, async (ingress, index) => {
     const rules = [{
       host: ingress.hostname,
       http: {
@@ -74,7 +74,7 @@ export async function createIngressResources(
       apiVersion: "extensions/v1beta1",
       kind: "Ingress",
       metadata: {
-        name: service.name,
+        name: `${service.name}-${index}`,
         annotations,
         namespace,
       },

diff --git a/garden-service/test/unit/src/plugins/kubernetes/container/ingress.ts b/garden-service/test/unit/src/plugins/kubernetes/container/ingress.ts
@@ -408,7 +408,7 @@ describe("createIngressResources", () => {
       apiVersion: "extensions/v1beta1",
       kind: "Ingress",
       metadata: {
-        name: service.name,
+        name: `${service.name}-0`,
         annotations: {
           "ingress.kubernetes.io/force-ssl-redirect": "false",
           "kubernetes.io/ingress.class": "nginx",
@@ -450,7 +450,7 @@ describe("createIngressResources", () => {
       apiVersion: "extensions/v1beta1",
       kind: "Ingress",
       metadata: {
-        name: service.name,
+        name: `${service.name}-0`,
         annotations: {
           "ingress.kubernetes.io/force-ssl-redirect": "false",
           "kubernetes.io/ingress.class": "nginx",
@@ -502,7 +502,7 @@ describe("createIngressResources", () => {
         apiVersion: "extensions/v1beta1",
         kind: "Ingress",
         metadata: {
-          name: service.name,
+          name: `${service.name}-0`,
           annotations: {
             "ingress.kubernetes.io/force-ssl-redirect": "false",
             "kubernetes.io/ingress.class": "nginx",
@@ -530,7 +530,7 @@ describe("createIngressResources", () => {
         apiVersion: "extensions/v1beta1",
         kind: "Ingress",
         metadata: {
-          name: service.name,
+          name: `${service.name}-1`,
           annotations: {
             "ingress.kubernetes.io/force-ssl-redirect": "false",
             "kubernetes.io/ingress.class": "nginx",
@@ -575,7 +575,7 @@ describe("createIngressResources", () => {
       apiVersion: "extensions/v1beta1",
       kind: "Ingress",
       metadata: {
-        name: service.name,
+        name: `${service.name}-0`,
         annotations: {
           "ingress.kubernetes.io/force-ssl-redirect": "true",
           "kubernetes.io/ingress.class": "nginx",
@@ -722,7 +722,7 @@ describe("createIngressResources", () => {
       apiVersion: "extensions/v1beta1",
       kind: "Ingress",
       metadata: {
-        name: service.name,
+        name: `${service.name}-0`,
         annotations: {
           "ingress.kubernetes.io/force-ssl-redirect": "true",
           "kubernetes.io/ingress.class": "nginx",
@@ -788,7 +788,7 @@ describe("createIngressResources", () => {
       apiVersion: "extensions/v1beta1",
       kind: "Ingress",
       metadata: {
-        name: service.name,
+        name: `${service.name}-0`,
         annotations: {
           "ingress.kubernetes.io/force-ssl-redirect": "true",
           "kubernetes.io/ingress.class": "nginx",