From efcdbbe6b87ece9989bc7ba508f7671382407503 Mon Sep 17 00:00:00 2001 From: Krzysztof Taraszka Date: Fri, 27 Dec 2024 14:06:17 +0100 Subject: [PATCH 1/5] 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/) --- .../templates/loadbalancer.yaml | 3 +++ .../values.schema.json | 27 +++++++++++++++++++ charts/caddy-ingress-controller/values.yaml | 3 ++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/charts/caddy-ingress-controller/templates/loadbalancer.yaml b/charts/caddy-ingress-controller/templates/loadbalancer.yaml index 1f63581..10eecc9 100644 --- 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 index 652a7c0..fcfbb50 100644 --- 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 index 2c6767e..7fb31c8 100644 --- a/charts/caddy-ingress-controller/values.yaml +++ b/charts/caddy-ingress-controller/values.yaml @@ -51,7 +51,8 @@ loadBalancer: # 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 externalTrafficPolicy: Cluster From 5daee0ed29f0966ecebbfd1c0dabd20d2f8c6bc6 Mon Sep 17 00:00:00 2001 From: Krzysztof Taraszka Date: Mon, 30 Dec 2024 23:46:14 +0100 Subject: [PATCH 2/5] bump version of the chart --- charts/caddy-ingress-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/caddy-ingress-controller/Chart.yaml b/charts/caddy-ingress-controller/Chart.yaml index bfcfe2b..b8a8f4c 100644 --- 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.2.1 appVersion: "v0.2.1" keywords: - ingress-controller From cb314003272f7aae17644b7056ed7f2392775555 Mon Sep 17 00:00:00 2001 From: Krzysztof Taraszka Date: Tue, 31 Dec 2024 18:53:11 +0100 Subject: [PATCH 3/5] make it minor release --- charts/caddy-ingress-controller/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/caddy-ingress-controller/Chart.yaml b/charts/caddy-ingress-controller/Chart.yaml index b8a8f4c..807f8fc 100644 --- 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.1 +version: 1.3.0 appVersion: "v0.2.1" keywords: - ingress-controller From 720ec20b3f599202aea2067c5ad528562acd1418 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Sun, 5 Jan 2025 15:46:04 +0100 Subject: [PATCH 4/5] fix trailing slash that break validation --- charts/caddy-ingress-controller/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/caddy-ingress-controller/values.yaml b/charts/caddy-ingress-controller/values.yaml index 7fb31c8..1a94b29 100644 --- a/charts/caddy-ingress-controller/values.yaml +++ b/charts/caddy-ingress-controller/values.yaml @@ -52,7 +52,7 @@ loadBalancer: # 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 externalTrafficPolicy: Cluster From a87ad0ebaa695ffee604d5f90b7793ef35a17362 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Sun, 5 Jan 2025 16:04:16 +0100 Subject: [PATCH 5/5] fix empty annotation object --- charts/caddy-ingress-controller/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/caddy-ingress-controller/values.yaml b/charts/caddy-ingress-controller/values.yaml index 1a94b29..df0bba5 100644 --- a/charts/caddy-ingress-controller/values.yaml +++ b/charts/caddy-ingress-controller/values.yaml @@ -45,7 +45,7 @@ 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: