Add loadBalancer.labels support (#276)

* Add loadBalancer.labels support For example, cilium LB IPAM uses labels to match pool with a service (https://docs.cilium.io/en/latest/network/lb-ipam/) * bump version of the chart * make it minor release * fix trailing slash that break validation * fix empty annotation object --------- Co-authored-by: Marco Vito Moscaritolo <[email protected]>
caddyserver · Jan 5, 2025 · e165d9f · e165d9f
1 parent b97d6c9
commit e165d9f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/charts/caddy-ingress-controller/Chart.yaml b/charts/caddy-ingress-controller/Chart.yaml
@@ -4,7 +4,7 @@ home: https://github.com/caddyserver/ingress
 description: A helm chart for the Caddy Kubernetes ingress controller
 icon: https://caddyserver.com/resources/images/caddy-circle-lock.svg
 type: application
-version: 1.2.0
+version: 1.3.0
 appVersion: "v0.2.1"
 keywords:
   - ingress-controller

diff --git a/charts/caddy-ingress-controller/templates/loadbalancer.yaml b/charts/caddy-ingress-controller/templates/loadbalancer.yaml
@@ -10,6 +10,9 @@ metadata:
   {{- end }}
   labels:
     {{- include "caddy-ingress-controller.labels" . | nindent 4 }}
+    {{- with .Values.loadBalancer.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: "LoadBalancer"
   {{- if (semverCompare "<= 1.24.0" .Capabilities.KubeVersion.Version) }}

diff --git a/charts/caddy-ingress-controller/values.schema.json b/charts/caddy-ingress-controller/values.schema.json
@@ -68,6 +68,33 @@
       "$id": "#/properties/fullnameOverride",
       "type": "string"
     },
+    "loadBalancer": {
+      "$id": "#/properties/loadBalancer",
+      "type": "object",
+      "required": [
+        "enabled"
+      ],
+      "properties": {
+        "enabled": {
+          "$id": "#/properties/loadBalancer/properties/enabled",
+          "type": "boolean"
+        },
+        "annotations": {
+          "$id": "#/properties/loadBalancer/properties/annotations",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "labels": {
+          "$id": "#/properties/loadBalancer/properties/labels",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "ingressController": {
       "$id": "#/properties/ingressController",
       "type": "object",

diff --git a/charts/caddy-ingress-controller/values.yaml b/charts/caddy-ingress-controller/values.yaml
@@ -45,12 +45,13 @@ loadBalancer:
   loadBalancerIP:
   # Set to 'Local' to maintain the client's IP on inbound connections
   externalTrafficPolicy:
-  annotations:
+  annotations: {}
     # service.beta.kubernetes.io/aws-load-balancer-type:
     # service.beta.kubernetes.io/aws-load-balancer-nlb-target-type:
     # service.beta.kubernetes.io/aws-load-balancer-scheme:
     # service.beta.kubernetes.io/aws-load-balancer-eip-allocations:
     # service.beta.kubernetes.io/aws-load-balancer-subnets:
+  labels: {}
 
 service:
   # Set to 'Local' to maintain the client's IP on inbound connections