remove ip from ingress

vultr · Aug 19, 2024 · 9ce9e22 · 9ce9e22
1 parent 0fbde40
commit 9ce9e22
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/docs/load-balancers.md b/docs/load-balancers.md
@@ -37,4 +37,7 @@ The annotations are listed below. Please note that all annotations listed below
 | `node-count`                       | int                               | 1                                                 | Number of LoadBalancer nodes to have. Only odd numbers are supported.                                                                                                                                            |
 | `create`                           | `true` or `false`                 | `true`                                            | This is used to determine whether or not to create a Vultr loadbalancer                                                                                                                                          |
 | `label`                            | string                            |                                                   | Custom label for the Vultr Loadbalancer rather than the default generated name                                                                                                                                   |
-| `hostname`                         | string                            |                                                   | Custom domain to be used for the load balancer. Ex: `example.vultr.com`
+| `hostname`                         | string                            |                                                   | Custom domain to be used for the load balancer. Ex: `example.vultr.com`
+
+
+
diff --git a/vultr/loadbalancers.go b/vultr/loadbalancers.go
@@ -130,13 +130,14 @@ func (l *loadbalancers) GetLoadBalancer(ctx context.Context, _ string, service *
 			} else {
 				return nil, true, fmt.Errorf("hostname %s is not a valid DNS name", service.Annotations[annoVultrHostname])
 			}
+			ingress = append(ingress, v1.LoadBalancerIngress{Hostname: hostname})
 		}
-	}
-
-	ingress = append(ingress, v1.LoadBalancerIngress{Hostname: hostname, IP: lb.IPV4})
+	} else {
+		ingress = append(ingress, v1.LoadBalancerIngress{Hostname: hostname, IP: lb.IPV4})
 
-	if enabledIPv6 {
-		ingress = append(ingress, v1.LoadBalancerIngress{Hostname: hostname, IP: lb.IPV6})
+		if enabledIPv6 {
+			ingress = append(ingress, v1.LoadBalancerIngress{Hostname: hostname, IP: lb.IPV6})
+		}
 	}
 
 	return &v1.LoadBalancerStatus{
@@ -219,13 +220,15 @@ func (l *loadbalancers) EnsureLoadBalancer(ctx context.Context, clusterName stri
 				} else {
 					return nil, fmt.Errorf("hostname %s is not a valid DNS name", service.Annotations[annoVultrHostname])
 				}
-			}
-		}
+				ingress = append(ingress, v1.LoadBalancerIngress{Hostname: hostname})
 
-		ingress = append(ingress, v1.LoadBalancerIngress{Hostname: hostname, IP: lb2.IPV4})
+			}
+		} else {
+			ingress = append(ingress, v1.LoadBalancerIngress{IP: lb2.IPV4})
 
-		if enabledIPv6 {
-			ingress = append(ingress, v1.LoadBalancerIngress{Hostname: hostname, IP: lb2.IPV6})
+			if enabledIPv6 {
+				ingress = append(ingress, v1.LoadBalancerIngress{IP: lb2.IPV6})
+			}
 		}
 
 		return &v1.LoadBalancerStatus{